diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 10:55:20 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 10:55:20 +1000 |
| commit | aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d (patch) | |
| tree | aac7ff987592f8040ce68d5a28ece5fa4cb0fc50 /arch/powerpc/include/asm | |
| parent | 932e9f352b5d685725076f21b237f7c7d804b29c (diff) | |
| parent | 4351f30a35b8c6a6b6d4d36e5c2dc8ec0262b2ca (diff) | |
Merge remote-tracking branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/mpic_msgr.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/reg_booke.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/mpic_msgr.h b/arch/powerpc/include/asm/mpic_msgr.h index 3ec37dc9003..326d33ca55c 100644 --- a/arch/powerpc/include/asm/mpic_msgr.h +++ b/arch/powerpc/include/asm/mpic_msgr.h @@ -13,6 +13,7 @@ #include <linux/types.h> #include <linux/spinlock.h> +#include <asm/smp.h> struct mpic_msgr { u32 __iomem *base; diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index b86faa9107d..8a97aa7289d 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -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 */ |