From 241fc17d5a3e72a1254bd50be2b97526b2486008 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 22 Apr 2008 14:47:03 -0300
Subject: [PATCH] --- yaml --- r: 92663 b: refs/heads/master c:
 a53a45567cb4879c46bb019757cdeb1b1ecabbd5 h: refs/heads/master i:   92661:
 23df8aa2ca12b6500b087b1a6b9c5c5644962db7   92659:
 caf0647c188a3301b016d12eba31c43643859fbc   92655:
 6638a6dd897076908f60e20a88fea134fdd300b9 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 00c09dd8994b..cac9b990ee46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca19aaa510b150ca358166b29eb2bb62ad971f76
+refs/heads/master: a53a45567cb4879c46bb019757cdeb1b1ecabbd5
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index c33ba35a4ddf..3434b0e6d675 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -218,16 +218,12 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
 		.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
 		.flag_has_cx25840 = !0,
 		.flag_has_hauppauge_rom = !0,
-#if 0
 		.flag_has_analogtuner = !0,
 		.flag_has_composite = !0,
 		.flag_has_svideo = !0,
 		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
 		.digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
 		.led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
-#else
-		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
-#endif
 };