summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-02-19 22:16:36 -0500
committerNicolas Pitre <nico@cam.org>2009-02-19 22:21:57 -0500
commit22fc1db12515e1b528570c547fd27e38df792f1f (patch)
tree9c7308bbac04abbd55f1000b2122bf7f94a9eedd /arch/arm/configs
parent402a917aca5daca69fcc91f43e6f1e6939cf393b (diff)
parent39008f959f4f3b60eecc5cec0ca077146c1f366b (diff)
downloadop-kernel-dev-22fc1db12515e1b528570c547fd27e38df792f1f.zip
op-kernel-dev-22fc1db12515e1b528570c547fd27e38df792f1f.tar.gz
Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/master
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/orion5x_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index a8ee698..a34ea6b 100644
--- 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
OpenPOWER on IntegriCloud