From 43720c567b03327cb1ce1c379e231ba6651ba7cc Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Fri, 19 Sep 2008 18:34:06 -0300 Subject: [PATCH] --- yaml --- r: 113944 b: refs/heads/master c: a3765888a7edc4efe54293d8f7c6676cae61057e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/af9015.c | 4 ++-- trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82edeb6e6d4b..d65b28cb33c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 111f9ecf174655f3da2b266602f20f11e6a6a4c7 +refs/heads/master: a3765888a7edc4efe54293d8f7c6676cae61057e diff --git a/trunk/drivers/media/dvb/dvb-usb/af9015.c b/trunk/drivers/media/dvb/dvb-usb/af9015.c index 505432b10b8d..f962d89db134 100644 --- a/trunk/drivers/media/dvb/dvb-usb/af9015.c +++ b/trunk/drivers/media/dvb/dvb-usb/af9015.c @@ -1196,7 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = { /* 10 */{USB_DEVICE(USB_VID_XTENSIONS, USB_PID_XTENSIONS_XD_380)}, {USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGIVOX_DUO)}, {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)}, - {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR)}, + {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)}, {0}, }; MODULE_DEVICE_TABLE(usb, af9015_usb_table); @@ -1365,7 +1365,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { .warm_ids = {NULL}, }, { - .name = "Telestar USB DVB-T", + .name = "Telestar Starstick 2", .cold_ids = {&af9015_usb_table[13], NULL}, .warm_ids = {NULL}, }, diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 60c241e0236f..66dc000d4e49 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -225,6 +225,6 @@ #define USB_PID_YUAN_EC372S 0x1edc #define USB_PID_DW2102 0x2102 #define USB_PID_XTENSIONS_XD_380 0x0381 -#define USB_PID_TELESTAR 0x8000 +#define USB_PID_TELESTAR_STARSTICK_2 0x8000 #endif