diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:24:52 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:24:52 +0900 |
commit | d08fe475120e3f17df37656d0644c0f17a797852 (patch) | |
tree | 64f0324afa9e884d8f0d738930a2495ba411c897 /arch/sh/configs/sh7757lcr_defconfig | |
parent | fb66c5238547495b4a79f590b20400683702448a (diff) | |
parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/sh/configs/sh7757lcr_defconfig')
-rw-r--r-- | arch/sh/configs/sh7757lcr_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig index fa0ecf87034..33ddb130a7c 100644 --- a/arch/sh/configs/sh7757lcr_defconfig +++ b/arch/sh/configs/sh7757lcr_defconfig @@ -70,7 +70,7 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_MMC=y -CONFIG_MMC_TMIO=y +CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y |