summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2009-01-05 20:37:07 +0000
committerAlexander Motin <mav@FreeBSD.org>2009-01-05 20:37:07 +0000
commit148eb107eaa4c8deb9a5ab2f4fac4b690f9831dd (patch)
tree67382c14cc375ee1596eeb503a52f28e568cf6f6 /sys
parent569db371ab4ce3aa3c5c68324656990e860ea7f5 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/NOTES11
-rw-r--r--sys/conf/files1
-rw-r--r--sys/modules/Makefile3
-rw-r--r--sys/modules/sdhci/Makefile8
4 files changed, 19 insertions, 4 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e14326879121..632b7dceea56 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -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
diff --git a/sys/conf/files b/sys/conf/files
index 3a1ae21af356..92d1940803ec 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -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
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6902094d1480..b7761dbdc747 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -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} \
diff --git a/sys/modules/sdhci/Makefile b/sys/modules/sdhci/Makefile
new file mode 100644
index 000000000000..29fc8b8f193d
--- /dev/null
+++ b/sys/modules/sdhci/Makefile
@@ -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>