Skip to content

L
linux-davinci-2.6.23
Commit 39a5e34c authored by 张青山(steven.zhang)'s avatar 张青山(steven.zhang)
Browse files
Options

Merge branch 'neuros' of... 

Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros
parents 00a07ac9 53899dec
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/arm/configs/ntosd_644xA_defconfig
View file @ 39a5e34c
...@@ -1111,7 +1111,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y ...@@ -1111,7 +1111,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# #
# MMC/SD Host Controller Drivers # MMC/SD Host Controller Drivers
# #
# CONFIG_MMC_DAVINCI is not set CONFIG_MMC_DAVINCI=y
CONFIG_RTC_LIB=y CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set # CONFIG_RTC_CLASS is not set
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment