From 5f9a535cfe97cf2293f34ad4799b35451f6b9a06 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 25 Jun 2006 15:33:12 -0300
Subject: [PATCH] --- yaml --- r: 30847 b: refs/heads/master c:
 1b58841aa7011670d8a32f53554e21b3fae9c047 h: refs/heads/master i:   30845:
 b72e6e75adc53c91922b34c44b1398ac84cedaef   30843:
 ae30e03863beea804021aeed8d8966a5ad2d8765   30839:
 8b43a155031b369f290497fa6f239eb2b39c483e   30831:
 690ad7ada78eff8b0103c64a960b59a2718c40e4   30815:
 b1a3e3721b82a0e80e939af655e87cdc1712fed9   30783:
 3e3c924c1fd371bc7f3d739aa51e0ce32a183fc7   30719:
 9991833e64508655770c042b36e7664ece7b545d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/tuner-core.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ae700edf6c49..736934da5232 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995235118ee7eaab7d9e9a1a661b12ef44e2a224
+refs/heads/master: 1b58841aa7011670d8a32f53554e21b3fae9c047
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index a26ded7d6fae..011413cf34a8 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -40,7 +40,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 };
@@ -54,8 +53,6 @@ static char ntsc[] = "-";
 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);
@@ -442,11 +439,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 	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];