aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 16:22:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 16:22:43 -0700
commit2f9c3c2c24af5f2e6061756d6fc04fdf66f41106 (patch)
tree692c71cf8e5fbc5d9fa29b56e1b08d9ea124ddda
parent1b41526975d8318ca17c93f724893884d03a0560 (diff)
parent092d01e260da628b01d4229c31a296111e3cd97a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Prevent au1xmmc.c breakage on non-Au1200 Alchemy [MMC] Add maintainers entry for MMC subsystem
-rw-r--r--MAINTAINERS5
-rw-r--r--drivers/mmc/Kconfig2
2 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 141c22269eb..c3c5842402d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1889,6 +1889,11 @@ L: linux-kernel@vger.kernel.org
W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
S: Maintained
+MULTIMEDIA CARD SUBSYSTEM
+P: Russell King
+M: rmk+mmc@arm.linux.org.uk
+S: Maintained
+
MULTISOUND SOUND DRIVER
P: Andrew Veliath
M: andrewtv@usa.net
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 003b077c232..45bcf098e76 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -84,7 +84,7 @@ config MMC_WBSD
config MMC_AU1X
tristate "Alchemy AU1XX0 MMC Card Interface support"
- depends on SOC_AU1X00 && MMC
+ depends on MMC && SOC_AU1200
help
This selects the AMD Alchemy(R) Multimedia card interface.
If you have a Alchemy platform with a MMC slot, say Y or M here.