From owner-svn-src-stable-8@FreeBSD.ORG  Wed May 26 17:30:14 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E00981065672;
	Wed, 26 May 2010 17:30:14 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B4FC68FC19;
	Wed, 26 May 2010 17:30:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4QHUEgJ011300;
	Wed, 26 May 2010 17:30:14 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4QHUE8A011297;
	Wed, 26 May 2010 17:30:14 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005261730.o4QHUE8A011297@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 26 May 2010 17:30:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208572 - in stable/8/sys/modules: ata/atadisk cam
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 May 2010 17:30:15 -0000

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