cpwatchdog: Move to drivers/watchdog/cpwd.c

Signed-off-by: NDavid S. Miller <davem@davemloft.net>

drivers/sbus/char/Makefile

@@ -11,7 +11,6 @@ bbc-objs := bbc_i2c.o bbc_envctrl.o
 
 obj-$(CONFIG_ENVCTRL)			+= envctrl.o
 obj-$(CONFIG_DISPLAY7SEG)		+= display7seg.o
-obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwatchdog.o
 obj-$(CONFIG_OBP_FLASH)			+= flash.o
 obj-$(CONFIG_SUN_OPENPROMIO)		+= openprom.o
 obj-$(CONFIG_SUN_MOSTEK_RTC)		+= rtc.o

drivers/watchdog/Makefile

@@ -123,6 +123,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 # SPARC64 Architecture
 
 obj-$(CONFIG_WATCHDOG_RIO)		+= riowd.o
+obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwd.o
 
 # XTENSA Architecture
 

drivers/sbus/char/cpwatchdog.c → drivers/watchdog/cpwd.c

-/* cpwatchdog.c - driver implementation for hardware watchdog
+/* cpwd.c - driver implementation for hardware watchdog
  * timers found on Sun Microsystems CP1400 and CP1500 boards.
  *
  * This device supports both the generic Linux watchdog