diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:22:43 -0400 |
| commit | 2f9c3c2c24af5f2e6061756d6fc04fdf66f41106 (patch) | |
| tree | 692c71cf8e5fbc5d9fa29b56e1b08d9ea124ddda /drivers | |
| parent | 1b41526975d8318ca17c93f724893884d03a0560 (diff) | |
| parent | 092d01e260da628b01d4229c31a296111e3cd97a (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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 003b077c2324..45bcf098e762 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig | |||
| @@ -84,7 +84,7 @@ config MMC_WBSD | |||
| 84 | 84 | ||
| 85 | config MMC_AU1X | 85 | config MMC_AU1X |
| 86 | tristate "Alchemy AU1XX0 MMC Card Interface support" | 86 | tristate "Alchemy AU1XX0 MMC Card Interface support" |
| 87 | depends on SOC_AU1X00 && MMC | 87 | depends on MMC && SOC_AU1200 |
| 88 | help | 88 | help |
| 89 | This selects the AMD Alchemy(R) Multimedia card interface. | 89 | This selects the AMD Alchemy(R) Multimedia card interface. |
| 90 | If you have a Alchemy platform with a MMC slot, say Y or M here. | 90 | If you have a Alchemy platform with a MMC slot, say Y or M here. |