Merge branch 'neuros' of...

Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros

Merge branch 'neuros' of...
Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros
39a5e34c · 张青山(steven.zhang) · 00a07ac9 · 53899dec · 39a5e34c
Commit 39a5e34c authored Apr 25, 2008 by 张青山(steven.zhang)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/configs/ntosd_644xA_defconfig arch/arm/configs/ntosd_644xA_defconfig +1 -1

No files found.
--- a/arch/arm/configs/ntosd_644xA_defconfig
+++ b/arch/arm/configs/ntosd_644xA_defconfig
@@ -1111,7 +1111,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # MMC/SD Host Controller Drivers
 #
-# CONFIG_MMC_DAVINCI is not set
+CONFIG_MMC_DAVINCI=y
 CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set