diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-02-20 04:16:36 +0100 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-02-20 04:21:57 +0100 |
| commit | 22fc1db12515e1b528570c547fd27e38df792f1f (patch) | |
| tree | 9c7308bbac04abbd55f1000b2122bf7f94a9eedd /arch/arm/configs | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [ARM] orion5x: TS-78xx support for 'hotplug' of FPGA devices (diff) | |
| download | linux-22fc1db12515e1b528570c547fd27e38df792f1f.tar.xz linux-22fc1db12515e1b528570c547fd27e38df792f1f.zip | |
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_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index a8ee6984a09e..a34ea6b2cc51 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 |