aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-29 17:07:01 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-29 17:07:01 -0700
commit8ab0dc333eacb2249c63d1fc7c5241299fa0493f (patch)
tree5e4118de12ec27b390a5e6238d4f69378ada6092
parentc5f8556cb5b8ab020f234191a6071cbeeeabd638 (diff)
downloadmrst-s0i3-test-8ab0dc333eacb2249c63d1fc7c5241299fa0493f.tar.gz
mrst-s0i3-test-8ab0dc333eacb2249c63d1fc7c5241299fa0493f.tar.xz
mrst-s0i3-test-8ab0dc333eacb2249c63d1fc7c5241299fa0493f.zip
cpwatchdog: Move to drivers/watchdog/cpwd.c
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/sbus/char/Makefile1
-rw-r--r--drivers/watchdog/Makefile1
-rw-r--r--drivers/watchdog/cpwd.c (renamed from drivers/sbus/char/cpwatchdog.c)2
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index b29c186b695..d83212ec541 100644
--- a/drivers/sbus/char/Makefile
+++ b/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/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 57c7e8bd8c8..b214612d819 100644
--- a/drivers/watchdog/Makefile
+++ b/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/drivers/sbus/char/cpwatchdog.c b/drivers/watchdog/cpwd.c
index c88df62e705..1f1ee2520f1 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