diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 07:04:46 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 07:04:46 -0400 |
| commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
| tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /drivers/mmc/Kconfig | |
| parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
| parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mmc/Kconfig')
| -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 2e70d74fbdee..4991bbd054f3 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig | |||
| @@ -51,7 +51,7 @@ config MMC_PXA | |||
| 51 | 51 | ||
| 52 | config MMC_WBSD | 52 | config MMC_WBSD |
| 53 | tristate "Winbond W83L51xD SD/MMC Card Interface support" | 53 | tristate "Winbond W83L51xD SD/MMC Card Interface support" |
| 54 | depends on MMC && ISA && ISA_DMA_API | 54 | depends on MMC && ISA_DMA_API |
| 55 | help | 55 | help |
| 56 | This selects the Winbond(R) W83L51xD Secure digital and | 56 | This selects the Winbond(R) W83L51xD Secure digital and |
| 57 | Multimedia card Interface. | 57 | Multimedia card Interface. |