From 979a77a5f34bca9010f52392d4318f7990afb35b Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Fri, 17 Nov 2006 21:51:35 +0100
Subject: [PATCH] --- yaml --- r: 41413 b: refs/heads/master c:
 cd57eeab7c4c108ce6e84545bdf37ae91b930781 h: refs/heads/master i:   41411:
 8ad7209913f07e2500b3a7f9b4a9bc77547b38b5 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/char/watchdog/rm9k_wdt.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8c08e5ee0bdf..5585860f4f75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 825d3748c1b5f9272e4f9769f1c2da85174ece28
+refs/heads/master: cd57eeab7c4c108ce6e84545bdf37ae91b930781
diff --git a/trunk/drivers/char/watchdog/rm9k_wdt.c b/trunk/drivers/char/watchdog/rm9k_wdt.c
index 8cd12ab9bff4..da3fc63bca61 100644
--- a/trunk/drivers/char/watchdog/rm9k_wdt.c
+++ b/trunk/drivers/char/watchdog/rm9k_wdt.c
@@ -45,7 +45,6 @@
 #define CPGIG1ER               0x0054
 
 
-
 /* Function prototypes */
 static int __init wdt_gpi_probe(struct device *);
 static int __exit wdt_gpi_remove(struct device *);
@@ -59,33 +58,37 @@ static int wdt_gpi_notify(struct notifier_block *, unsigned long, void *);
 static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *);
 
 
-
-
 static const char wdt_gpi_name[] = "wdt_gpi";
 static atomic_t opencnt;
 static int expect_close;
 static int locked = 0;
 
 
-
 /* These are set from device resources */
 static void __iomem * wd_regs;
 static unsigned int wd_irq, wd_ctr;
 
 
-
 /* Module arguments */
 static int timeout = MAX_TIMEOUT_SECONDS;
 module_param(timeout, int, 0444);
+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
+
 static unsigned long resetaddr = 0xbffdc200;
 module_param(resetaddr, ulong, 0444);
+MODULE_PARM_DESC(resetaddr, "Address to write to to force a reset");
+
 static unsigned long flagaddr = 0xbffdc104;
 module_param(flagaddr, ulong, 0444);
+MODULE_PARM_DESC(flagaddr, "Address to write to boot flags to");
+
 static int powercycle = 0;
 module_param(powercycle, bool, 0444);
+MODULE_PARM_DESC(powercycle, "Cycle power if watchdog expires");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0444);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");
 
 
 
@@ -424,8 +427,4 @@ MODULE_DESCRIPTION("Basler eXcite watchdog driver for gpi devices");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
-MODULE_PARM_DESC(resetaddr, "Address to write to to force a reset");
-MODULE_PARM_DESC(flagaddr, "Address to write to boot flags to");
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");
-MODULE_PARM_DESC(powercycle, "Cycle power if watchdog expires");
+