Module Name: src
Committed By: kiyohara
Date: Thu Sep 23 07:08:57 UTC 2010
Modified Files:
src/sys/arch/evbarm/conf: files.evbarm files.g42xxeb files.gumstix
Log Message:
Move 'include files.sdmmc' to files.evbarm.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/files.evbarm
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/files.g42xxeb
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/files.gumstix
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/files.evbarm
diff -u src/sys/arch/evbarm/conf/files.evbarm:1.21 src/sys/arch/evbarm/conf/files.evbarm:1.22
--- src/sys/arch/evbarm/conf/files.evbarm:1.21 Mon Mar 17 09:30:02 2008
+++ src/sys/arch/evbarm/conf/files.evbarm Thu Sep 23 07:08:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.evbarm,v 1.21 2008/03/17 09:30:02 kiyohara Exp $
+# $NetBSD: files.evbarm,v 1.22 2010/09/23 07:08:57 kiyohara Exp $
#
# First try for arm-specific configuration info
#
@@ -35,6 +35,7 @@
include "dev/pci/files.pci" # PCI devices
include "dev/cardbus/files.cardbus" # and CardBus devices
include "dev/pcmcia/files.pcmcia" # PCMCIA devices
+include "dev/sdmmc/files.sdmmc" # SD/MMC devices
include "dev/scsipi/files.scsipi" # SCSI devices
include "dev/usb/files.usb" # USB devices
Index: src/sys/arch/evbarm/conf/files.g42xxeb
diff -u src/sys/arch/evbarm/conf/files.g42xxeb:1.6 src/sys/arch/evbarm/conf/files.g42xxeb:1.7
--- src/sys/arch/evbarm/conf/files.g42xxeb:1.6 Sat Mar 13 11:37:47 2010
+++ src/sys/arch/evbarm/conf/files.g42xxeb Thu Sep 23 07:08:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.g42xxeb,v 1.6 2010/03/13 11:37:47 bsh Exp $
+# $NetBSD: files.g42xxeb,v 1.7 2010/09/23 07:08:57 kiyohara Exp $
#
# Genetec corp. G4255EB evaluation board configuration info
#
@@ -8,9 +8,6 @@
# CPU support and integrated peripherals
include "arch/arm/xscale/files.pxa2x0"
-# Machine-independent SD/MMC drivers
-include "dev/sdmmc/files.sdmmc"
-
# G4250EBX on-board devices (including CPLD)
device obio {[addr=-1], [intr=-1]}
attach obio at pxaip
Index: src/sys/arch/evbarm/conf/files.gumstix
diff -u src/sys/arch/evbarm/conf/files.gumstix:1.16 src/sys/arch/evbarm/conf/files.gumstix:1.17
--- src/sys/arch/evbarm/conf/files.gumstix:1.16 Sat Jul 10 08:17:48 2010
+++ src/sys/arch/evbarm/conf/files.gumstix Thu Sep 23 07:08:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.gumstix,v 1.16 2010/07/10 08:17:48 kiyohara Exp $
+# $NetBSD: files.gumstix,v 1.17 2010/09/23 07:08:57 kiyohara Exp $
#
# Gumstix. Inc. Gumstix boards configuration info
#
@@ -31,8 +31,6 @@
attach gxiic at pxaip
file arch/evbarm/gumstix/gxiic.c gxiic
-include "dev/sdmmc/files.sdmmc"
-
# MMC/SD controller
attach pxamci at pxaip with gxmci
file arch/evbarm/gumstix/gxmci.c gxmci