From 0a4cbfeb6eb7d1bcbcd981074d2383560e7916e0 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 20 Oct 2010 06:51:27 +0000
Subject: [PATCH] --- yaml --- r: 227738 b: refs/heads/master c:
 2e991201e4ebffb1fb32873d72e2ee4b499269c3 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hwmon/adt7470.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2513808f4636..e6deb7c4735e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe826749aec090c6f9ab48502bb9a7777572b85b
+refs/heads/master: 2e991201e4ebffb1fb32873d72e2ee4b499269c3
diff --git a/trunk/drivers/hwmon/adt7470.c b/trunk/drivers/hwmon/adt7470.c
index 87d92a56a939..c6d1ce059aea 100644
--- a/trunk/drivers/hwmon/adt7470.c
+++ b/trunk/drivers/hwmon/adt7470.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
@@ -274,7 +276,7 @@ static int adt7470_read_temperatures(struct i2c_client *client,
 	i2c_smbus_write_byte_data(client, ADT7470_REG_PWM_CFG(2), pwm_cfg[1]);
 
 	if (res) {
-		printk(KERN_ERR "ha ha, interrupted");
+		pr_err("ha ha, interrupted\n");
 		return -EAGAIN;
 	}