diff --git a/[refs] b/[refs]
index a2170f4696fc..55804e881bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f8556cb5b8ab020f234191a6071cbeeeabd638
+refs/heads/master: 8ab0dc333eacb2249c63d1fc7c5241299fa0493f
diff --git a/trunk/drivers/sbus/char/Makefile b/trunk/drivers/sbus/char/Makefile
index b29c186b6956..d83212ec5417 100644
--- a/trunk/drivers/sbus/char/Makefile
+++ b/trunk/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/trunk/drivers/watchdog/Makefile b/trunk/drivers/watchdog/Makefile
index 57c7e8bd8c88..b214612d819d 100644
--- a/trunk/drivers/watchdog/Makefile
+++ b/trunk/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/trunk/drivers/sbus/char/cpwatchdog.c b/trunk/drivers/watchdog/cpwd.c
similarity index 99%
rename from trunk/drivers/sbus/char/cpwatchdog.c
rename to trunk/drivers/watchdog/cpwd.c
index c88df62e7055..1f1ee2520f17 100644
--- a/trunk/drivers/sbus/char/cpwatchdog.c
+++ b/trunk/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