diff --git a/[refs] b/[refs] index c8397a8aed77..3b3857062abf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb3cef84adec0fdba1a2531bcefe438a838a57dd +refs/heads/master: 60ce1c20068ec2c138cdf9e5cbe583cc60883c62 diff --git a/trunk/arch/arm/configs/orion_defconfig b/trunk/arch/arm/configs/orion_defconfig index 9a42b2fc9f65..85b80f6b78e1 100644 --- a/trunk/arch/arm/configs/orion_defconfig +++ b/trunk/arch/arm/configs/orion_defconfig @@ -1108,7 +1108,7 @@ CONFIG_RTC_DRV_RS5C372=y # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_M41T80=y # CONFIG_RTC_DRV_M41T80_WDT is not set #