---

yaml --- r: 113055 b: refs/heads/master c: 957183f h: refs/heads/master i: 113053: 3c8f57e 113051: 1b19e27 113047: 0c4ba98 113039: e47a928 113023: 2925bd9 v: v3
git-mirror · Aug 29, 2008 · 95dad33 · 95dad33
1 parent 402f0d8
commit 95dad33
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/drivers/watchdog/riowd.c b/trunk/drivers/sbus/char/riowatchdog.c → 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)
  */