Merge remote-tracking branch 'kumar/merge' into merge

2012-04-23 10:55:20 +10:00
parent 932e9f352b 4351f30a35
commit aec49c7c0e
9 changed files with 71 additions and 33 deletions
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -150,6 +150,9 @@ notrace void __init machine_init(u64 dt_ptr)
 }

 #ifdef CONFIG_BOOKE_WDT
+extern u32 booke_wdt_enabled;
+extern u32 booke_wdt_period;
+
 /* Checks wdt=x and wdt_period=xx command-line option */
 notrace int __init early_parse_wdt(char *p)
 {