From 3868f627639866b257daad1be3b612249e3efcad Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2008 19:15:35 -0700
Subject: [PATCH] --- yaml --- r: 88199 b: refs/heads/master c:
 7180c4c9e09888db0a188f729c96c6d7bd61fa83 h: refs/heads/master i:   88197:
 bee01f161616a248f394bfb7d6bdcb5165040825   88195:
 8149e5b333a643b710e5df7dcb12a1ba40411a39   88191:
 4dc3125d74f3dfb5af7f365fbcb4cc5d50148ed7 v: v3

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

diff --git a/[refs] b/[refs]
index 5dfd5aa65272..f40473403fb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 869ab5147e1eead890245cfd4f652ba282b6ac26
+refs/heads/master: 7180c4c9e09888db0a188f729c96c6d7bd61fa83
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 98557ce950cd..fe9991c10cf4 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -175,12 +175,16 @@ 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
 };