diff --git a/[refs] b/[refs]
index d2ccd8609924..38206602327c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e30ddcf2fbd2ec68ec42156d9a04d946d195b54
+refs/heads/master: 1b6b73336dbb3c6513ce7d8454b279fd96603126
diff --git a/trunk/drivers/media/common/tuners/tda18271-priv.h b/trunk/drivers/media/common/tuners/tda18271-priv.h
index 74beb28806f8..48db9c679e4e 100644
--- a/trunk/drivers/media/common/tuners/tda18271-priv.h
+++ b/trunk/drivers/media/common/tuners/tda18271-priv.h
@@ -137,17 +137,17 @@ extern int tda18271_debug;
 #define tda_printk(kern, fmt, arg...) \
 	printk(kern "%s: " fmt, __func__, ##arg)
 
-#define dprintk(kern, lvl, fmt, arg...) do {\
+#define tda_dprintk(lvl, fmt, arg...) do {\
 	if (tda18271_debug & lvl) \
-		tda_printk(kern, fmt, ##arg); } while (0)
+		tda_printk(KERN_DEBUG, fmt, ##arg); } while (0)
 
 #define tda_info(fmt, arg...) printk(KERN_INFO              fmt, ##arg)
 #define tda_warn(fmt, arg...) tda_printk(KERN_WARNING,      fmt, ##arg)
 #define tda_err(fmt, arg...)  tda_printk(KERN_ERR,          fmt, ##arg)
-#define tda_dbg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_INFO, fmt, ##arg)
-#define tda_map(fmt, arg...)  dprintk(KERN_DEBUG, DBG_MAP,  fmt, ##arg)
-#define tda_reg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_REG,  fmt, ##arg)
-#define tda_cal(fmt, arg...)  dprintk(KERN_DEBUG, DBG_CAL,  fmt, ##arg)
+#define tda_dbg(fmt, arg...)  tda_dprintk(DBG_INFO,         fmt, ##arg)
+#define tda_map(fmt, arg...)  tda_dprintk(DBG_MAP,          fmt, ##arg)
+#define tda_reg(fmt, arg...)  tda_dprintk(DBG_REG,          fmt, ##arg)
+#define tda_cal(fmt, arg...)  tda_dprintk(DBG_CAL,          fmt, ##arg)
 
 #define tda_fail(ret)							     \
 ({									     \