projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/master
[linux-block.git]
/
arch
/
arm
/
configs
/
orion5x_defconfig
diff --git
a/arch/arm/configs/orion5x_defconfig
b/arch/arm/configs/orion5x_defconfig
index a8ee6984a09ecb2e9e3a19f0105dec3e371e4de7..a34ea6b2cc517fac2b96b2f319681e3e014f23a9 100644
(file)
--- a/
arch/arm/configs/orion5x_defconfig
+++ b/
arch/arm/configs/orion5x_defconfig
@@
-1177,7
+1177,7
@@
CONFIG_RTC_DRV_S35390A=y
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_M48T86=y
# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_V3020 is not set