svn commit: r186792 - in stable/7/sys: conf modules modules/sdhci

[Alexander Motin]

Author: mav
Date: Mon Jan  5 20:37:07 2009
New Revision: 186792
URL: http://svn.freebsd.org/changeset/base/186792

Log:
  MFC rev. 184138.
  
  Add mmc, mmcsd and sdhci modules to the build.

Added:
  stable/7/sys/modules/sdhci/
  stable/7/sys/modules/sdhci/Makefile   (contents, props changed)
Modified:
  stable/7/sys/conf/NOTES
  stable/7/sys/conf/files
  stable/7/sys/modules/Makefile

Modified: stable/7/sys/conf/NOTES
==============================================================================
--- stable/7/sys/conf/NOTES	Mon Jan  5 20:29:01 2009	(r186791)
+++ stable/7/sys/conf/NOTES	Mon Jan  5 20:37:07 2009	(r186792)
@@ -2238,10 +2238,13 @@ device		cardbus
 #
 # MMC/SD
 #
-# mmc: mmc bus
-# mmcsd: mmc memory and sd cards.
-#device		mmc
-#device		mmcsd
+# mmc 		MMC/SD bus
+# mmcsd		MMC/SD memory card
+# sdhci		Generic PCI SD Host Controller
+#
+device		mmc
+device		mmcsd
+device		sdhci
 
 #
 # SMB bus

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Mon Jan  5 20:29:01 2009	(r186791)
+++ stable/7/sys/conf/files	Mon Jan  5 20:37:07 2009	(r186792)
@@ -935,6 +935,7 @@ dev/scc/scc_dev_sab82532.c	optional	scc
 dev/scc/scc_dev_z8530.c		optional	scc
 dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
+dev/sdhci/sdhci.c		optional sdhci pci
 dev/sf/if_sf.c			optional sf pci
 dev/si/si.c			optional si
 dev/si/si2_z280.c		optional si

Modified: stable/7/sys/modules/Makefile
==============================================================================
--- stable/7/sys/modules/Makefile	Mon Jan  5 20:29:01 2009	(r186791)
+++ stable/7/sys/modules/Makefile	Mon Jan  5 20:37:07 2009	(r186792)
@@ -180,6 +180,8 @@ SUBDIR=	${_3dfx} \
 	mii \
 	mlx \
 	${_mly} \
+	mmc \
+	mmcsd \
 	mpt \
 	mqueue \
 	msdosfs \
@@ -246,6 +248,7 @@ SUBDIR=	${_3dfx} \
 	scc \
 	scd \
 	${_scsi_low} \
+	sdhci \
 	sem \
 	sf \
 	${_sio} \

Added: stable/7/sys/modules/sdhci/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/modules/sdhci/Makefile	Mon Jan  5 20:37:07 2009	(r186792)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/sdhci
+
+KMOD=	sdhci
+SRCS=	sdhci.c sdhci.h device_if.h bus_if.h pci_if.h mmcbr_if.h
+
+.include <bsd.kmod.mk>