From 6f940ccce34b2f1da38951744fe9535f441771b5 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Sat, 10 Sep 2005 20:53:57 +0200
Subject: [PATCH] --- yaml --- r: 8799 b: refs/heads/master c:
 180536f8274b76d69a589ab9af4b73d3b780e62f h: refs/heads/master i:   8797:
 94767a21fa5da66b08079f56fc4e7e0d2759ac1d   8795:
 448d1bea75781d8804127c50b2f690bedfcfe5a4   8791:
 f00538e0375866bd26b05b39594abdd7fe0c5b30   8783:
 a2b612f73f3015063bc020f85bd84a5a2d7b9bf3   8767:
 67dce808ad1908c86feed7eafa72d95a4d2dcafb v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/char/watchdog/Kconfig  | 43 ++++++++++++++--------------
 trunk/drivers/char/watchdog/Makefile |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 8516e227fac5..7d989fa33006 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4af953321fa65ae5705cb3becc742ab1ba1d6f
+refs/heads/master: 180536f8274b76d69a589ab9af4b73d3b780e62f
diff --git a/trunk/drivers/char/watchdog/Kconfig b/trunk/drivers/char/watchdog/Kconfig
index c3898afce3ae..f5af900704ac 100644
--- a/trunk/drivers/char/watchdog/Kconfig
+++ b/trunk/drivers/char/watchdog/Kconfig
@@ -84,6 +84,17 @@ config 977_WATCHDOG
 
 	  Not sure? It's safe to say N.
 
+config IXP2000_WATCHDOG
+	tristate "IXP2000 Watchdog"
+	depends on WATCHDOG && ARCH_IXP2000
+	help
+	  Say Y here if to include support for the watchdog timer
+	  in the Intel IXP2000(2400, 2800, 2850) network processors.
+	  This driver can be built as a module by choosing M. The module
+	  will be called ixp2000_wdt.
+
+	  Say N if you are unsure.
+
 config IXP4XX_WATCHDOG
 	tristate "IXP4xx Watchdog"
 	depends on WATCHDOG && ARCH_IXP4XX
@@ -100,17 +111,6 @@ config IXP4XX_WATCHDOG
 
 	  Say N if you are unsure.
 
-config IXP2000_WATCHDOG
-	tristate "IXP2000 Watchdog"
-	depends on WATCHDOG && ARCH_IXP2000
-	help
-	  Say Y here if to include support for the watchdog timer
-	  in the Intel IXP2000(2400, 2800, 2850) network processors.
-	  This driver can be built as a module by choosing M. The module
-	  will be called ixp2000_wdt.
-
-	  Say N if you are unsure.
-
 config S3C2410_WATCHDOG
 	tristate "S3C2410 Watchdog"
 	depends on WATCHDOG && ARCH_S3C2410
@@ -353,6 +353,17 @@ config BOOKE_WDT
 	  Please see Documentation/watchdog/watchdog-api.txt for
 	  more information.
 
+# PPC64 Architecture
+
+config WATCHDOG_RTAS
+	tristate "RTAS watchdog"
+	depends on WATCHDOG && PPC_RTAS
+	help
+	  This driver adds watchdog support for the RTAS watchdog.
+
+          To compile this driver as a module, choose M here. The module
+	  will be called wdrtas.
+
 # MIPS Architecture
 
 config INDYDOG
@@ -421,16 +432,6 @@ config WATCHDOG_RIO
 	  machines.  The watchdog timeout period is normally one minute but
 	  can be changed with a boot-time parameter.
 
-# ppc64 RTAS watchdog
-config WATCHDOG_RTAS
-	tristate "RTAS watchdog"
-	depends on WATCHDOG && PPC_RTAS
-	help
-	  This driver adds watchdog support for the RTAS watchdog.
-
-          To compile this driver as a module, choose M here. The module
-	  will be called wdrtas.
-
 #
 # ISA-based Watchdog Cards
 #
diff --git a/trunk/drivers/char/watchdog/Makefile b/trunk/drivers/char/watchdog/Makefile
index cfeac6f10137..fbd5cf63064b 100644
--- a/trunk/drivers/char/watchdog/Makefile
+++ b/trunk/drivers/char/watchdog/Makefile
@@ -50,10 +50,10 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 
 # PowerPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 
 # PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
-obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
 
 # MIPS Architecture
 obj-$(CONFIG_INDYDOG) += indydog.o