[WATCHDOG] Merge code clean-up's from Alan Cox.

Merge branch 'alan' of ../linux-2.6-watchdog-mm
Fixed Conflicts in the following files:
	drivers/watchdog/booke_wdt.c
	drivers/watchdog/mpc5200_wdt.c
	drivers/watchdog/sc1200wdt.c

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --cc drivers/watchdog/booke_wdt.c
index 7708244,4c423d5..06b7a17
--- 1/drivers/watchdog/booke_wdt.c
--- 2/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@@ -131,9 -131,10 +131,10 @@@ static int booke_wdt_open(struct inode 
        spin_lock(&booke_wdt_lock);
        if (booke_wdt_enabled == 0) {
                booke_wdt_enabled = 1;
 -              on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
 +              on_each_cpu(__booke_wdt_enable, NULL, 0);
-               printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
-                               "(wdt_period=%d)\n", booke_wdt_period);
+               printk(KERN_INFO
+                     "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                               booke_wdt_period);
        }
        spin_unlock(&booke_wdt_lock);
  
@@@ -175,9 -176,10 +176,10 @@@ static int __init booke_wdt_init(void
  
        spin_lock(&booke_wdt_lock);
        if (booke_wdt_enabled == 1) {
-               printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "
-                               "(wdt_period=%d)\n", booke_wdt_period);
+               printk(KERN_INFO
+                     "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                               booke_wdt_period);
 -              on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
 +              on_each_cpu(__booke_wdt_enable, NULL, 0);
        }
        spin_unlock(&booke_wdt_lock);
  

diff --cc drivers/watchdog/hpwdt.c
Simple merge