[PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables

Renamed global variables used to convey if the watchdog is enabled and
periodicity of the timer and moved the declarations into a header for these
variables

Signed-off-by: Matt McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 9c44588f0af..545cfd0fab5 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -623,10 +623,8 @@ machine_init(unsigned long r3, unsigned long r4, unsigned long r5,
 /* Checks wdt=x and wdt_period=xx command-line option */
 int __init early_parse_wdt(char *p)
 {
-        extern u32 wdt_enable;
-
         if (p && strncmp(p, "0", 1) != 0)
-               wdt_enable = 1;
+               booke_wdt_enabled = 1;
 
         return 0;
 }
@@ -634,10 +632,8 @@ early_param("wdt", early_parse_wdt);
 
 int __init early_parse_wdt_period (char *p)
 {
-        extern u32 wdt_period;
-
         if (p)
-                wdt_period = simple_strtoul(p, NULL, 0);
+                booke_wdt_period = simple_strtoul(p, NULL, 0);
 
         return 0;
 }