diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 15:40:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 15:40:24 -0700 |
| commit | 957183f32e136450eb9a4b8eed52dfac46834eed (patch) | |
| tree | 8c0b70602f1c2043e5bab7337580ca666e70ca99 | |
| parent | e42311d75107ca78868ded0286b691aad2df1f29 (diff) | |
| download | op-kernel-dev-957183f32e136450eb9a4b8eed52dfac46834eed.zip op-kernel-dev-957183f32e136450eb9a4b8eed52dfac46834eed.tar.gz | |
riowatchdog: Move under drivers/watchdog
The config stuff was already in drivers/watchdog/Kconfig
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/sbus/char/Makefile | 1 | ||||
| -rw-r--r-- | drivers/watchdog/Makefile | 2 | ||||
| -rw-r--r-- | drivers/watchdog/riowd.c (renamed from drivers/sbus/char/riowatchdog.c) | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile index e15bd5e..b29c186 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 ca3dc04..57c7e8b 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 index b53af83..98bb60f 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) */ |
