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/ivtv | |
| 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/ivtv')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-cards.c b/linux/drivers/media/video/ivtv/ivtv-cards.c index 26c1cb3fd..bf6948eda 100644 --- a/linux/drivers/media/video/ivtv/ivtv-cards.c +++ b/linux/drivers/media/video/ivtv/ivtv-cards.c @@ -863,7 +863,7 @@ static const struct ivtv_card ivtv_card_pg600v2 = { }, #endif .tuners = { - { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 }, + { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, }, .pci_list = ivtv_pci_pg600v2, }; @@ -909,7 +909,7 @@ static const struct ivtv_card ivtv_card_club3d = { }, #endif .tuners = { - { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 }, + { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, }, .pci_list = ivtv_pci_club3d, }; @@ -954,7 +954,7 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = { .gpio_init = { .direction = 0xe000, .initial_value = 0x4000 }, /* enable line-in */ #endif .tuners = { - { .std = V4L2_STD_ALL, .tuner = TUNER_XCEIVE_XC3028 }, + { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, }, .pci_list = ivtv_pci_avertv_mce116, }; diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index 59837795c..051593a17 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -833,7 +833,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) /* load modules */ #ifndef CONFIG_VIDEO_TUNER if (hw & IVTV_HW_TUNER) { - if (itv->options.tuner == TUNER_XCEIVE_XC3028) { + if (itv->options.tuner == TUNER_XC2028) { IVTV_INFO("Xceive tuner not yet supported, only composite and S-Video inputs will be available\n"); itv->tunerid = 1; } |