cpwatchdog: Move to drivers/watchdog/cpwd.c

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

diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index b29c186b69562e01f56b236da477e3ed3884f10f..d83212ec54170eae418bdeb676440ead45bf48c6 100644 (file)
--- a/drivers/sbus/char/Makefile
+++ b/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

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 57c7e8bd8c880c67966d65521e9f5c9b81c1e539..b214612d819d01d2a59d455d499ba624f4929759 100644 (file)
--- a/drivers/watchdog/Makefile
+++ b/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
 

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/watchdog/cpwd.c
similarity index 99%
rename from drivers/sbus/char/cpwatchdog.c
rename to drivers/watchdog/cpwd.c
index c88df62e7055a2c2b5846b221be00a5f5d772b61..1f1ee2520f172e244ffe1a590591160bb97c0a44 100644 (file)
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/watchdog/cpwd.c
@@ -1,4 +1,4 @@
-/* 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