aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/media/tuner.h4
-rw-r--r--include/media/v4l2-common.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 6a8ef189e5fa..584f3ab1fcf7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -202,7 +202,6 @@ struct tuner {
202 void (*standby)(struct i2c_client *c); 202 void (*standby)(struct i2c_client *c);
203}; 203};
204 204
205extern unsigned int tuner_debug;
206extern unsigned const int tuner_count; 205extern unsigned const int tuner_count;
207 206
208extern int microtune_init(struct i2c_client *c); 207extern int microtune_init(struct i2c_client *c);
@@ -220,7 +219,8 @@ extern int tea5767_autodetection(struct i2c_client *c);
220 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \ 219 printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
221 i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0) 220 i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
222#define tuner_dbg(fmt, arg...) do {\ 221#define tuner_dbg(fmt, arg...) do {\
223 if (tuner_debug) \ 222 extern int debug; \
223 if (debug) \
224 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \ 224 printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
225 i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0) 225 i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
226 226
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index c5ca993679ec..51cdca8365c9 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -51,6 +51,7 @@
51 parameter called 'debug'. */ 51 parameter called 'debug'. */
52#define v4l_dbg(level, client, fmt, arg...) \ 52#define v4l_dbg(level, client, fmt, arg...) \
53 do { \ 53 do { \
54 extern int debug; \
54 if (debug >= (level)) \ 55 if (debug >= (level)) \
55 v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ 56 v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
56 } while (0) 57 } while (0)