diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index e15bd5e39463d9e49a06745fde4d6edaaf97ab83..b29c186b69562e01f56b236da477e3ed3884f10f 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -12,7 +12,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_WATCHDOG_RIO)		+= riowatchdog.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 ca3dc043d786bec3d35b10cab72a685e4aea9209..57c7e8bd8c880c67966d65521e9f5c9b81c1e539 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -122,6 +122,8 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 
 # SPARC64 Architecture
 
+obj-$(CONFIG_WATCHDOG_RIO)		+= riowd.o
+
 # XTENSA Architecture
 
 # Architecture Independant
diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/watchdog/riowd.c
similarity index 98%
rename from drivers/sbus/char/riowatchdog.c
rename to drivers/watchdog/riowd.c
index b53af832a3af3d6f7a378b3efc44fa882a0a584a..98bb60ff02f2c078bdadde8923ebcd8982f9e0fe 100644
--- a/drivers/sbus/char/riowatchdog.c
+++ b/drivers/watchdog/riowd.c
@@ -1,4 +1,4 @@
-/* riowatchdog.c - driver for hw watchdog inside Super I/O of RIO
+/* riowd.c - driver for hw watchdog inside Super I/O of RIO
  *
  * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)
  */