Date: Wed, 26 May 2010 17:30:14 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r208572 - in stable/8/sys/modules: ata/atadisk cam Message-ID: <201005261730.o4QHUE8A011297@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Wed May 26 17:30:14 2010 New Revision: 208572 URL: http://svn.freebsd.org/changeset/base/208572 Log: MFC: r208468 At least on sparc64 these modules require ata_machdep.c. Approved by: re (kib) Modified: stable/8/sys/modules/ata/atadisk/Makefile stable/8/sys/modules/cam/Makefile Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/modules/ata/atadisk/Makefile ============================================================================== --- stable/8/sys/modules/ata/atadisk/Makefile Wed May 26 17:18:32 2010 (r208571) +++ stable/8/sys/modules/ata/atadisk/Makefile Wed May 26 17:30:14 2010 (r208572) @@ -1,9 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${.CURDIR}/../../../dev/ata ${.CURDIR}/../../../${MACHINE}/${MACHINE} KMOD= atadisk -SRCS= ata-disk.c +SRCS= ata-disk.c ${ata_machdep} SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +.if exists(${.CURDIR}/../../../${MACHINE}/${MACHINE}/ata_machdep.c) +ata_machdep= ata_machdep.c +.endif + .include <bsd.kmod.mk> Modified: stable/8/sys/modules/cam/Makefile ============================================================================== --- stable/8/sys/modules/cam/Makefile Wed May 26 17:18:32 2010 (r208571) +++ stable/8/sys/modules/cam/Makefile Wed May 26 17:30:14 2010 (r208572) @@ -2,7 +2,7 @@ S= ${.CURDIR}/../.. -.PATH: $S/cam $S/cam/scsi $S/cam/ata +.PATH: $S/cam $S/cam/scsi $S/cam/ata $S/${MACHINE}/${MACHINE} KMOD= cam @@ -28,6 +28,9 @@ SRCS+= scsi_xpt.c SRCS+= ata_all.c SRCS+= ata_xpt.c SRCS+= ata_da.c +.if exists($S/${MACHINE}/${MACHINE}/ata_machdep.c) +SRCS+= ata_machdep.c +.endif SRCS+= ata_pmp.c EXPORT_SYMS= YES # XXX evaluate
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005261730.o4QHUE8A011297>