diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-25 14:33:12 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-26 23:17:37 -0400 |
| commit | 1b58841aa7011670d8a32f53554e21b3fae9c047 (patch) | |
| tree | 1c9baea38f49126adbd3320fe4baa29346669f2b | |
| parent | 995235118ee7eaab7d9e9a1a661b12ef44e2a224 (diff) | |
V4L/DVB (4254): Remove obsoleted tuner_debug option.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/tuner-core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index a26ded7d6fae..011413cf34a8 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
| @@ -40,7 +40,6 @@ static unsigned int no_autodetect = 0; | |||
| 40 | static unsigned int show_i2c = 0; | 40 | static unsigned int show_i2c = 0; |
| 41 | 41 | ||
| 42 | /* insmod options used at runtime => read/write */ | 42 | /* insmod options used at runtime => read/write */ |
| 43 | static unsigned int tuner_debug_old = 0; | ||
| 44 | int tuner_debug = 0; | 43 | int tuner_debug = 0; |
| 45 | 44 | ||
| 46 | static unsigned int tv_range[2] = { 44, 958 }; | 45 | static unsigned int tv_range[2] = { 44, 958 }; |
| @@ -54,8 +53,6 @@ static char ntsc[] = "-"; | |||
| 54 | module_param(addr, int, 0444); | 53 | module_param(addr, int, 0444); |
| 55 | module_param(no_autodetect, int, 0444); | 54 | module_param(no_autodetect, int, 0444); |
| 56 | module_param(show_i2c, int, 0444); | 55 | module_param(show_i2c, int, 0444); |
| 57 | /* Note: tuner_debug is deprecated and will be removed in 2.6.17 */ | ||
| 58 | module_param_named(tuner_debug,tuner_debug_old, int, 0444); | ||
| 59 | module_param_named(debug,tuner_debug, int, 0644); | 56 | module_param_named(debug,tuner_debug, int, 0644); |
| 60 | module_param_string(pal, pal, sizeof(pal), 0644); | 57 | module_param_string(pal, pal, sizeof(pal), 0644); |
| 61 | module_param_string(secam, secam, sizeof(secam), 0644); | 58 | module_param_string(secam, secam, sizeof(secam), 0644); |
| @@ -442,11 +439,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) | |||
| 442 | t->audmode = V4L2_TUNER_MODE_STEREO; | 439 | t->audmode = V4L2_TUNER_MODE_STEREO; |
| 443 | t->mode_mask = T_UNINITIALIZED; | 440 | t->mode_mask = T_UNINITIALIZED; |
| 444 | t->tuner_status = tuner_status; | 441 | t->tuner_status = tuner_status; |
| 445 | if (tuner_debug_old) { | ||
| 446 | tuner_debug = tuner_debug_old; | ||
| 447 | printk(KERN_ERR "tuner: tuner_debug is deprecated and will be removed in 2.6.17.\n"); | ||
| 448 | printk(KERN_ERR "tuner: use the debug option instead.\n"); | ||
| 449 | } | ||
| 450 | 442 | ||
| 451 | if (show_i2c) { | 443 | if (show_i2c) { |
| 452 | unsigned char buffer[16]; | 444 | unsigned char buffer[16]; |
