summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:36:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:36:32 -0800
commit593195f9b2309693f27b402f34573f7920b82c3e (patch)
tree54d55557665e72e90ef35a1e0f008d381c17ed98 /include
parent983d5dbdb2b38d024935f560a91cddcf704875f3 (diff)
parentf9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff)
downloadop-kernel-dev-593195f9b2309693f27b402f34573f7920b82c3e.zip
op-kernel-dev-593195f9b2309693f27b402f34573f7920b82c3e.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'include')
-rw-r--r--include/media/tuner.h4
-rw-r--r--include/media/v4l2-common.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 7674b12..27cbf08 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 3cc3132..c74052a 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)
OpenPOWER on IntegriCloud