diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-04 02:51:34 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 09:06:25 -0400 |
commit | 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f (patch) | |
tree | a9afe194d2d4cee5d3356f25c790b4486dd2b77a /drivers/watchdog | |
parent | 500c919e3d699644cc9d6c1e93022481baafd8e1 (diff) |
[WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
Rename the driver because now we support some MPC86xx processors.
There are no changes to the mpc83xx_wdt.c file, yet. When possible, we do
file renames and changes separately (because Linus once asked so, because
it helps git to track the renamed files).
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/Kconfig | 11 | ||||
-rw-r--r-- | drivers/watchdog/Makefile | 2 | ||||
-rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c (renamed from drivers/watchdog/mpc83xx_wdt.c) | 0 |
3 files changed, 10 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 93329620f447..01e33e80eac0 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -695,9 +695,16 @@ config 8xx_WDT | |||
695 | tristate "MPC8xx Watchdog Timer" | 695 | tristate "MPC8xx Watchdog Timer" |
696 | depends on 8xx | 696 | depends on 8xx |
697 | 697 | ||
698 | config 83xx_WDT | 698 | config 8xxx_WDT |
699 | tristate "MPC83xx/MPC86xx Watchdog Timer" | 699 | tristate "MPC8xxx Platform Watchdog Timer" |
700 | depends on PPC_83xx || PPC_86xx | 700 | depends on PPC_83xx || PPC_86xx |
701 | help | ||
702 | This driver is for a SoC level watchdog that exists on some | ||
703 | Freescale PowerPC processors. So far this driver supports: | ||
704 | - MPC83xx watchdogs | ||
705 | - MPC86xx watchdogs | ||
706 | |||
707 | For BookE processors (MPC85xx) use the BOOKE_WDT driver instead. | ||
701 | 708 | ||
702 | config MV64X60_WDT | 709 | config MV64X60_WDT |
703 | tristate "MV64X60 (Marvell Discovery) Watchdog Timer" | 710 | tristate "MV64X60 (Marvell Discovery) Watchdog Timer" |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index edd305a64e63..cdd674ffaa21 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
@@ -103,7 +103,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o | |||
103 | # POWERPC Architecture | 103 | # POWERPC Architecture |
104 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o | 104 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o |
105 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o | 105 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o |
106 | obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o | 106 | obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o |
107 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o | 107 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o |
108 | obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o | 108 | obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o |
109 | 109 | ||
diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index fa82ec99ba81..fa82ec99ba81 100644 --- a/drivers/watchdog/mpc83xx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||