diff options
-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 e15bd5e39463..b29c186b6956 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile | |||
@@ -12,7 +12,6 @@ bbc-objs := bbc_i2c.o bbc_envctrl.o | |||
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 | 14 | obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwatchdog.o |
15 | obj-$(CONFIG_WATCHDOG_RIO) += riowatchdog.o | ||
16 | obj-$(CONFIG_OBP_FLASH) += flash.o | 15 | obj-$(CONFIG_OBP_FLASH) += flash.o |
17 | obj-$(CONFIG_SUN_OPENPROMIO) += openprom.o | 16 | obj-$(CONFIG_SUN_OPENPROMIO) += openprom.o |
18 | obj-$(CONFIG_SUN_MOSTEK_RTC) += rtc.o | 17 | obj-$(CONFIG_SUN_MOSTEK_RTC) += rtc.o |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index ca3dc043d786..57c7e8bd8c88 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
@@ -122,6 +122,8 @@ obj-$(CONFIG_SH_WDT) += shwdt.o | |||
122 | 122 | ||
123 | # SPARC64 Architecture | 123 | # SPARC64 Architecture |
124 | 124 | ||
125 | obj-$(CONFIG_WATCHDOG_RIO) += riowd.o | ||
126 | |||
125 | # XTENSA Architecture | 127 | # XTENSA Architecture |
126 | 128 | ||
127 | # Architecture Independant | 129 | # Architecture Independant |
diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/watchdog/riowd.c index b53af832a3af..98bb60ff02f2 100644 --- a/drivers/sbus/char/riowatchdog.c +++ b/drivers/watchdog/riowd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* riowatchdog.c - driver for hw watchdog inside Super I/O of RIO | 1 | /* riowd.c - driver for hw watchdog inside Super I/O of RIO |
2 | * | 2 | * |
3 | * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net) | 3 | * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net) |
4 | */ | 4 | */ |