Merge branch 'v2.6.34-rc2' into drm-linus

[sfrench/cifs-2.6.git] / drivers / watchdog / softdog.c

diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index ebcc9cea5e99e40ec31917f9c4c9dd90da81d8a5..833f49f43d43b61ca6267dd5bdf7aaa2bbea31b3 100644 (file)
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -71,7 +71,9 @@ static int soft_noboot = 0;
 #endif  /* ONLY_TESTING */
 
 module_param(soft_noboot, int, 0);
-MODULE_PARM_DESC(soft_noboot, "Softdog action, set to 1 to ignore reboots, 0 to reboot (default depends on ONLY_TESTING)");
+MODULE_PARM_DESC(soft_noboot,
+       "Softdog action, set to 1 to ignore reboots, 0 to reboot "
+                                       "(default depends on ONLY_TESTING)");
 
 /*
  *     Our timer
@@ -264,7 +266,8 @@ static struct notifier_block softdog_notifier = {
        .notifier_call  = softdog_notify_sys,
 };
 
-static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.07 initialized. soft_noboot=%d soft_margin=%d sec (nowayout= %d)\n";
+static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.07 "
+       "initialized. soft_noboot=%d soft_margin=%d sec (nowayout= %d)\n";
 
 static int __init watchdog_init(void)
 {