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
@@ -13,6 +13,7 @@

 #include <linux/types.h>
 #include <linux/spinlock.h>
+#include <asm/smp.h>

 struct mpic_msgr {
 	u32 __iomem *base;
@@ -15,11 +15,6 @@
 #ifndef __ASM_POWERPC_REG_BOOKE_H__
 #define __ASM_POWERPC_REG_BOOKE_H__

-#ifdef CONFIG_BOOKE_WDT
-extern u32 booke_wdt_enabled;
-extern u32 booke_wdt_period;
-#endif /* CONFIG_BOOKE_WDT */
-
 /* Machine State Register (MSR) Fields */
 #define MSR_GS		(1<<28) /* Guest state */
 #define MSR_UCLE	(1<<26)	/* User-mode cache lock enable */