---

yaml --- r: 175839 b: refs/heads/master c: 6d53559 h: refs/heads/master i: 175837: b2b8550 175835: 796fec9 175831: cac2e4c 175823: b1c8e5f 175807: 9a483ba v: v3
git-mirror · Dec 8, 2009 · 31de0ed · 31de0ed
1 parent 5b49348
commit 31de0ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 296 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eda43d16ef3d0bd59e3b762de3ffc73bab02efe9
+refs/heads/master: 6d5355998a757a16815d58da4a739b15a6efbfba
diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig
@@ -861,8 +861,10 @@ config GEF_WDT
 	  Watchdog timer found in a number of GE Fanuc single board computers.
 
 config MPC5200_WDT
-	tristate "MPC5200 Watchdog Timer"
+	bool "MPC52xx Watchdog Timer"
 	depends on PPC_MPC52xx
+	help
+	  Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.
 
 config 8xxx_WDT
 	tristate "MPC8xxx Platform Watchdog Timer"

diff --git a/trunk/drivers/watchdog/Makefile b/trunk/drivers/watchdog/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 
 # POWERPC Architecture
 obj-$(CONFIG_GEF_WDT) += gef_wdt.o
-obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
 obj-$(CONFIG_PIKA_WDT) += pika_wdt.o

diff --git a/trunk/drivers/watchdog/mpc5200_wdt.c b/trunk/drivers/watchdog/mpc5200_wdt.c