From 20be9cfbcf2d66781bc5715667ffee24775ecb74 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <michael.frysinger@analog.com>
Date: Wed, 30 Jan 2008 17:38:21 +0800
Subject: [PATCH] --- yaml --- r: 85876 b: refs/heads/master c:
 bb59b5578a73d0e0e4e208a014fa7ea0c4f0ccb4 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/bfin_wdt.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 07e0f0a46dfb..62f7abc80f78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea8115bb6f359df4f45152f2b40e1d4d1891392
+refs/heads/master: bb59b5578a73d0e0e4e208a014fa7ea0c4f0ccb4
diff --git a/trunk/drivers/watchdog/bfin_wdt.c b/trunk/drivers/watchdog/bfin_wdt.c
index 472be10f0686..1237113dc14a 100644
--- a/trunk/drivers/watchdog/bfin_wdt.c
+++ b/trunk/drivers/watchdog/bfin_wdt.c
@@ -29,6 +29,7 @@
 
 #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
 #define stampit() stamp("here i am")
+#define pr_init(fmt, args...) ({ static const __initdata char __fmt[] = fmt; printk(__fmt, ## args); })
 
 #define WATCHDOG_NAME "bfin-wdt"
 #define PFX WATCHDOG_NAME ": "
@@ -445,19 +446,19 @@ static int __init bfin_wdt_init(void)
 
 	ret = register_reboot_notifier(&bfin_wdt_notifier);
 	if (ret) {
-		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret);
+		pr_init(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret);
 		return ret;
 	}
 
 	ret = misc_register(&bfin_wdt_miscdev);
 	if (ret) {
-		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+		pr_init(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
 		       WATCHDOG_MINOR, ret);
 		unregister_reboot_notifier(&bfin_wdt_notifier);
 		return ret;
 	}
 
-	printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
+	pr_init(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
 	       timeout, nowayout);
 
 	return 0;