diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-04-06 20:40:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 19:14:34 -0700 |
| commit | 4c3b01f71181a52ab7735a7c52b1aa2232826075 (patch) | |
| tree | 131f85e0cb78c624dc6cc417aed86070c3849d40 /drivers/media | |
| parent | ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c (diff) | |
| download | linux-3.10-4c3b01f71181a52ab7735a7c52b1aa2232826075.tar.gz linux-3.10-4c3b01f71181a52ab7735a7c52b1aa2232826075.tar.bz2 linux-3.10-4c3b01f71181a52ab7735a7c52b1aa2232826075.zip | |
pvrusb2: fix broken build due to patch order dependency
Fix broken build due to patch order dependency. A future patch requires
the lines that break the current build. Disable those lines for now.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 98557ce950c..fe9991c10cf 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/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 }; |