diff --git a/[refs] b/[refs] index ca1a0511a458..671e6c872a85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c874d6fa851191bd8b9c0fce39a2d3c1ee06f96 +refs/heads/master: c33e14c724406d987111ee73f1c5335a1f450473 diff --git a/trunk/arch/arm/configs/s3c6400_defconfig b/trunk/arch/arm/configs/s3c6400_defconfig index 559c44404e91..cf3c1b5d7048 100644 --- a/trunk/arch/arm/configs/s3c6400_defconfig +++ b/trunk/arch/arm/configs/s3c6400_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-rc3 -# Mon Nov 3 10:07:29 2008 +# Mon Nov 3 10:10:30 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -651,7 +651,7 @@ CONFIG_SDIO_UART=y # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=y -# CONFIG_MMC_SDHCI_S3C is not set +CONFIG_MMC_SDHCI_S3C=y # CONFIG_MEMSTICK is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_NEW_LEDS is not set