aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2008-09-19 17:34:06 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:37:03 -0400
commita3765888a7edc4efe54293d8f7c6676cae61057e (patch)
tree5a5c16652e4c9a119e25eec9b27188b7bd9ac30c
parent111f9ecf174655f3da2b266602f20f11e6a6a4c7 (diff)
V4L/DVB (8975): af9015: cleanup
- cleanup Telestar Starstick 2 patch Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c4
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 505432b10b8d..f962d89db134 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1196,7 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = {
1196/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)}, 1196/* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)},
1197 {USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)}, 1197 {USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)},
1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)}, 1198 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
1199 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)}, 1199 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)},
1200 {0}, 1200 {0},
1201}; 1201};
1202MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1202MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1365,7 +1365,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1365 .warm_ids = {NULL}, 1365 .warm_ids = {NULL},
1366 }, 1366 },
1367 { 1367 {
1368 .name = "Telestar USB DVB-T", 1368 .name = "Telestar Starstick 2",
1369 .cold_ids = {&af9015_usb_table[13], NULL}, 1369 .cold_ids = {&af9015_usb_table[13], NULL},
1370 .warm_ids = {NULL}, 1370 .warm_ids = {NULL},
1371 }, 1371 },
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 60c241e0236f..66dc000d4e49 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -225,6 +225,6 @@
225#define USB_PID_YUAN_EC372S 0x1edc 225#define USB_PID_YUAN_EC372S 0x1edc
226#define USB_PID_DW2102 0x2102 226#define USB_PID_DW2102 0x2102
227#define USB_PID_XTENSIONS_XD_380 0x0381 227#define USB_PID_XTENSIONS_XD_380 0x0381
228#define USB_PID_TELESTAR 0x8000 228#define USB_PID_TELESTAR_STARSTICK_2 0x8000
229 229
230#endif 230#endif