diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index b29c186..d83212e 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -11,7 +11,6 @@
 
 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 57c7e8b..b214612 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -123,6 +123,7 @@
 # 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 98%
rename from drivers/sbus/char/cpwatchdog.c
rename to drivers/watchdog/cpwd.c
index c88df62..1f1ee25 100644
--- 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