diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-29 20:07:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 20:07:01 -0400 |
commit | 8ab0dc333eacb2249c63d1fc7c5241299fa0493f (patch) | |
tree | 5e4118de12ec27b390a5e6238d4f69378ada6092 /drivers | |
parent | c5f8556cb5b8ab020f234191a6071cbeeeabd638 (diff) |
cpwatchdog: Move to drivers/watchdog/cpwd.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sbus/char/Makefile | 1 | ||||
-rw-r--r-- | drivers/watchdog/Makefile | 1 | ||||
-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 b29c186b6956..d83212ec5417 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile | |||
@@ -11,7 +11,6 @@ bbc-objs := bbc_i2c.o bbc_envctrl.o | |||
11 | 11 | ||
12 | obj-$(CONFIG_ENVCTRL) += envctrl.o | 12 | obj-$(CONFIG_ENVCTRL) += envctrl.o |
13 | obj-$(CONFIG_DISPLAY7SEG) += display7seg.o | 13 | obj-$(CONFIG_DISPLAY7SEG) += display7seg.o |
14 | obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwatchdog.o | ||
15 | obj-$(CONFIG_OBP_FLASH) += flash.o | 14 | obj-$(CONFIG_OBP_FLASH) += flash.o |
16 | obj-$(CONFIG_SUN_OPENPROMIO) += openprom.o | 15 | obj-$(CONFIG_SUN_OPENPROMIO) += openprom.o |
17 | obj-$(CONFIG_SUN_MOSTEK_RTC) += rtc.o | 16 | obj-$(CONFIG_SUN_MOSTEK_RTC) += rtc.o |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 57c7e8bd8c88..b214612d819d 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
@@ -123,6 +123,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o | |||
123 | # SPARC64 Architecture | 123 | # SPARC64 Architecture |
124 | 124 | ||
125 | obj-$(CONFIG_WATCHDOG_RIO) += riowd.o | 125 | obj-$(CONFIG_WATCHDOG_RIO) += riowd.o |
126 | obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o | ||
126 | 127 | ||
127 | # XTENSA Architecture | 128 | # XTENSA Architecture |
128 | 129 | ||
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/watchdog/cpwd.c index c88df62e7055..1f1ee2520f17 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* cpwatchdog.c - driver implementation for hardware watchdog | 1 | /* cpwd.c - driver implementation for hardware watchdog |
2 | * timers found on Sun Microsystems CP1400 and CP1500 boards. | 2 | * timers found on Sun Microsystems CP1400 and CP1500 boards. |
3 | * | 3 | * |
4 | * This device supports both the generic Linux watchdog | 4 | * This device supports both the generic Linux watchdog |