diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-24 12:08:20 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-24 12:08:20 -0200 |
| commit | 7c8e1a2aecbfdcad224468d9500ce587901fbcc4 (patch) | |
| tree | c1542dda9ef8599266a2f698673be1491c00a6c3 /linux/drivers/media/video/em28xx/em28xx-cards.c | |
| parent | b8056c434721c17f8cc3426ce74a440b1e760d9d (diff) | |
| download | mediapointer-dvb-s2-7c8e1a2aecbfdcad224468d9500ce587901fbcc4.tar.gz mediapointer-dvb-s2-7c8e1a2aecbfdcad224468d9500ce587901fbcc4.tar.bz2 | |
Remove the obsoleted xc3028
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Remove the old xc3028.c file, replacing all occurrences of
TUNER_XCEIVE_XC3028 to TUNER_XC2028.
Some work is still may be required to make sure that non-tm6000 drivers will
be capable of using tuner-xc2028.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/Documentation/video4linux/CARDLIST.tuner | 2 +-
linux/drivers/media/video/em28xx/em28xx-cards.c | 10 +++-------
linux/drivers/media/video/ivtv/ivtv-cards.c | 6 +++---
linux/drivers/media/video/ivtv/ivtv-driver.c | 2 +-
linux/drivers/media/video/tuner-core.c | 5 -----
linux/drivers/media/video/tuner-types.c | 6 +++---
linux/include/media/tuner.h | 2 +-
v4l/Makefile | 4 ----
8 files changed, 12 insertions(+), 25 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 9809463b6..441b03d30 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -157,13 +157,12 @@ struct em28xx_board em28xx_boards[] = { MSP_DSP_IN_SCART, MSP_DSP_IN_SCART), }}, }, -#ifdef CONFIG_XC3028 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { .name = "Hauppauge WinTV HVR 900", .vchannels = 3, .norm = VIDEO_MODE_PAL, .tda9887_conf = TDA9887_PRESENT, - .tuner_type = TUNER_XCEIVE_XC3028, + .tuner_type = TUNER_XC2028, .has_tuner = 1, .decoder = EM28XX_TVP5150, .input = {{ @@ -186,7 +185,7 @@ struct em28xx_board em28xx_boards[] = { .norm = VIDEO_MODE_PAL, .tda9887_conf = TDA9887_PRESENT, .has_tuner = 1, - .tuner_type = TUNER_XCEIVE_XC3028, + .tuner_type = TUNER_XC2028, .decoder = EM28XX_TVP5150, .input = {{ .type = EM28XX_VMUX_TELEVISION, @@ -210,7 +209,7 @@ struct em28xx_board em28xx_boards[] = { .norm = VIDEO_MODE_PAL, .tda9887_conf = TDA9887_PRESENT, .has_tuner = 1, - .tuner_type = TUNER_XCEIVE_XC3028, + .tuner_type = TUNER_XC2028, .decoder = EM28XX_TVP5150, .input = {{ .type = EM28XX_VMUX_TELEVISION, @@ -226,7 +225,6 @@ struct em28xx_board em28xx_boards[] = { .amux = 1, }}, }, -#endif [EM2820_BOARD_MSI_VOX_USB_2] = { .name = "MSI VOX USB 2.0", .vchannels = 3, @@ -345,11 +343,9 @@ struct usb_device_id em28xx_id_table [] = { { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, -#ifdef CONFIG_XC3028 { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, -#endif { }, }; |