diff --git a/[refs] b/[refs]
index 8bded9d7cf4e..619e0fd257ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4942744f93884cb462400c66258c0013bea65dcf
+refs/heads/master: 241020d19ee9da29171d989ff876c657e4b938b5
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index b92efe0460f3..17c873c869af 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -30,6 +30,8 @@
 
 #define UNSET (-1U)
 
+#define PREFIX "tuner "
+
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
 #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
diff --git a/trunk/drivers/media/video/tuner-driver.h b/trunk/drivers/media/video/tuner-driver.h
index 0df136e58eb3..1c60229dcd0a 100644
--- a/trunk/drivers/media/video/tuner-driver.h
+++ b/trunk/drivers/media/video/tuner-driver.h
@@ -71,15 +71,15 @@ struct tuner {
 /* ------------------------------------------------------------------------ */
 
 #define tuner_warn(fmt, arg...) do {\
-	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
+	printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
 #define tuner_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
+	printk(KERN_INFO PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
 	extern int tuner_debug; \
 	if (tuner_debug) \
-		printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
+		printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
 
 #endif /* __TUNER_DRIVER_H__ */