Commit 2f9c3c2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b415269 092d01e2

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -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

drivers/mmc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.