diff --git a/[refs] b/[refs] index 9880031f8b6d..5138af020999 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e73aedba562d1e7777287043afb8e46131ed402e +refs/heads/master: 25a31e2df0ee22bdc23494371db9e858b3a23471 diff --git a/trunk/include/asm-ppc/m48t35.h b/trunk/include/asm-ppc/m48t35.h index f3c5e5dfa986..a5277ea4b194 100644 --- a/trunk/include/asm-ppc/m48t35.h +++ b/trunk/include/asm-ppc/m48t35.h @@ -39,7 +39,7 @@ #define M48T35_RTC_WATCHDOG_RB 0x03 #define M48T35_RTC_WATCHDOG_BMB 0x7c #define M48T35_RTC_WATCHDOG_WDS 0x80 -#define M48T35_RTC_WATCHDOG_ALL (M48T35_RTC_WATCHDOG_RB|M48T35_RTC_WATCHDOG_BMB|M48T35_RTC_W +#define M48T35_RTC_WATCHDOG_ALL (M48T35_RTC_WATCHDOG_RB|M48T35_RTC_WATCHDOG_BMB|M48T35_RTC_W) #define M48T35_RTC_CONTROL_WRITE 0x80 #define M48T35_RTC_CONTROL_READ 0x40