summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-common.h
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/media/v4l2-common.h
parent983d5dbdb2b38d024935f560a91cddcf704875f3 (diff)
parentf9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'include/media/v4l2-common.h')
-rw-r--r--include/media/v4l2-common.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 3cc3132f391..c74052abb18 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)