Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[mv-sheeva.git] / arch / arm / configs / s3c6400_defconfig

diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig
index 559c44404e91bd8f0e103e15208e7747efe53e9d..cf3c1b5d70485817956409d619be117e0642f56d 100644 (file)
--- a/arch/arm/configs/s3c6400_defconfig
+++ b/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