summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2012-11-29 23:38:26 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2012-11-29 23:38:26 +0000
commitfbf04812c6f2522909b038faba28722bb9198771 (patch)
tree748e880e6ade4bdfa152351f524a646e2c685036
parente9bd58b2f6eac5915430d66b9e0140f121efde1b (diff)
Enable rtsx(4) in GENERIC on i386 and amd64.
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 12306a865cb..8a46937220b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.334 2012/10/08 17:26:02 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.335 2012/11/29 23:38:25 stsp Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -265,6 +265,8 @@ com* at cardbus?
sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
+rtsx* at pci? # Realtek SD Card Reader
+sdmmc* at rtsx? # SD/MMC bus
# Bluetooth controllers
#sbt* at sdmmc? disable # SDIO Bluetooth
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0c7d0e12130..546407f4017 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.741 2012/10/08 17:26:02 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.742 2012/11/29 23:38:25 stsp Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -322,6 +322,8 @@ com* at cardbus?
sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
+rtsx* at pci? # Realtek SD Card Reader
+sdmmc* at rtsx? # SD/MMC bus
# Bluetooth controllers
#sbt* at sdmmc? disable # SDIO Bluetooth