diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
commit | 6bf77e770ed9aaba385261c18ec5c8f16a160e20 (patch) | |
tree | e5376cf1e1c8a9c07221f424e05dc22609427c91 /linux/drivers/media/video/tuner-core.c | |
parent | c265cca51af88f5caff789df5ead7de8662ccc0f (diff) | |
parent | 1719eff8a6f088e48ed02067ff1a00577f53d1aa (diff) | |
download | mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.gz mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.bz2 |
merge: http://linuxtv.org/hg/~hverkuil/tda9887
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 7ff9fb327..606d8fabd 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -47,7 +47,6 @@ static unsigned int no_autodetect = 0; static unsigned int show_i2c = 0; /* insmod options used at runtime => read/write */ -static unsigned int tuner_debug_old = 0; int tuner_debug = 0; static unsigned int tv_range[2] = { 44, 958 }; @@ -66,15 +65,12 @@ MODULE_PARM(tv_range,"2i"); MODULE_PARM(radio_range,"2i"); MODULE_PARM(no_autodetect, "i"); MODULE_PARM(tuner_debug, "i"); -MODULE_PARM(tuner_debug_old, "i"); MODULE_PARM(addr, "i"); MODULE_PARM(show_i2c, "i"); #else module_param(addr, int, 0444); module_param(no_autodetect, int, 0444); module_param(show_i2c, int, 0444); -/* Note: tuner_debug is deprecated and will be removed in 2.6.17 */ -module_param_named(tuner_debug,tuner_debug_old, int, 0444); module_param_named(debug,tuner_debug, int, 0644); module_param_string(pal, pal, sizeof(pal), 0644); module_param_string(secam, secam, sizeof(secam), 0644); @@ -489,11 +485,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, t->audmode = V4L2_TUNER_MODE_STEREO; t->mode_mask = T_UNINITIALIZED; t->tuner_status = tuner_status; - if (tuner_debug_old) { - tuner_debug = tuner_debug_old; - printk(KERN_ERR "tuner: tuner_debug is deprecated and will be removed in 2.6.17.\n"); - printk(KERN_ERR "tuner: use the debug option instead.\n"); - } if (show_i2c) { unsigned char buffer[16]; |