diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:20:20 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 09:20:20 -0300 |
commit | a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975 (patch) | |
tree | 741bed0ecafa35596053d8e6debbce43691a0a39 /linux/drivers/media/video/cx25840 | |
parent | 77b963e9fbc0911412eb7b86df83d976f81abf2d (diff) | |
parent | 3590a589476f8094edb2a807adaa699215c2d5ee (diff) | |
download | mediapointer-dvb-s2-a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975.tar.gz mediapointer-dvb-s2-a2f7e7dbf0f5aeb8842ac6c3e9acd151180d1975.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/mxl5007t
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840')
-rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index ecd498c70..7b48e0285 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -51,7 +51,7 @@ MODULE_LICENSE("GPL"); static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; -int cx25840_debug; +static int cx25840_debug; module_param_named(debug,cx25840_debug, int, 0644); diff --git a/linux/drivers/media/video/cx25840/cx25840-core.h b/linux/drivers/media/video/cx25840/cx25840-core.h index f81a9a959..cd549b119 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.h +++ b/linux/drivers/media/video/cx25840/cx25840-core.h @@ -25,8 +25,6 @@ #include <linux/videodev2.h> #include <linux/i2c.h> -extern int cx25840_debug; - /* ENABLE_PVR150_WORKAROUND activates a workaround for a hardware bug that is present in Hauppauge PVR-150 (and possibly PVR-500) cards that have certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The |