diff --git a/[refs] b/[refs]
index 3ce0a1ece6c0..b2e5d87e88e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e42311d75107ca78868ded0286b691aad2df1f29
+refs/heads/master: 957183f32e136450eb9a4b8eed52dfac46834eed
diff --git a/trunk/drivers/sbus/char/Makefile b/trunk/drivers/sbus/char/Makefile
index e15bd5e39463..b29c186b6956 100644
--- a/trunk/drivers/sbus/char/Makefile
+++ b/trunk/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/trunk/drivers/watchdog/Makefile b/trunk/drivers/watchdog/Makefile
index ca3dc043d786..57c7e8bd8c88 100644
--- a/trunk/drivers/watchdog/Makefile
+++ b/trunk/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/trunk/drivers/sbus/char/riowatchdog.c b/trunk/drivers/watchdog/riowd.c
similarity index 98%
rename from trunk/drivers/sbus/char/riowatchdog.c
rename to trunk/drivers/watchdog/riowd.c
index b53af832a3af..98bb60ff02f2 100644
--- a/trunk/drivers/sbus/char/riowatchdog.c
+++ b/trunk/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)
  */