Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

2 files changed, 3 insertions, 4 deletions

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 7674b121ce8b..27cbf08c931d 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -218,8 +218,8 @@ extern int tea5767_autodetection(struct i2c_client *c);
         printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
                         i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
-        extern int debug; \
-        if (debug) \
+        extern int tuner_debug; \
+        if (tuner_debug) \
                 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
                         i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 3cc3132f391e..c74052abb189 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -49,9 +49,8 @@
 
 /* These three macros assume that the debug level is set with a module
    parameter called 'debug'. */
-#define v4l_dbg(level, client, fmt, arg...)                                  \
+#define v4l_dbg(level, debug, client, fmt, arg...)                           \
         do {                                                                 \
-                extern int debug;                                            \
                 if (debug >= (level))                                        \
                         v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
         } while (0)