diff options
| -rw-r--r-- | drivers/media/dvb-core/dvb-usb-ids.h | 4 | ||||
| -rw-r--r-- | drivers/media/usb/dvb-usb/dib0700_devices.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h index 55acd11dc052..e200aa6f2d2f 100644 --- a/drivers/media/dvb-core/dvb-usb-ids.h +++ b/drivers/media/dvb-core/dvb-usb-ids.h | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | #define USB_VID_EVOLUTEPC 0x1e59 | 79 | #define USB_VID_EVOLUTEPC 0x1e59 |
| 80 | #define USB_VID_AZUREWAVE 0x13d3 | 80 | #define USB_VID_AZUREWAVE 0x13d3 |
| 81 | #define USB_VID_TECHNISAT 0x14f7 | 81 | #define USB_VID_TECHNISAT 0x14f7 |
| 82 | #define USB_VID_HAMA 0x147f | ||
| 82 | 83 | ||
| 83 | /* Product IDs */ | 84 | /* Product IDs */ |
| 84 | #define USB_PID_ADSTECH_USB2_COLD 0xa333 | 85 | #define USB_PID_ADSTECH_USB2_COLD 0xa333 |
| @@ -413,5 +414,6 @@ | |||
| 413 | #define USB_PID_SVEON_STV27 0xd3af | 414 | #define USB_PID_SVEON_STV27 0xd3af |
| 414 | #define USB_PID_TURBOX_DTT_2000 0xd3a4 | 415 | #define USB_PID_TURBOX_DTT_2000 0xd3a4 |
| 415 | #define USB_PID_WINTV_SOLOHD 0x0264 | 416 | #define USB_PID_WINTV_SOLOHD 0x0264 |
| 416 | #define USB_PID_EVOLVEO_XTRATV_STICK 0xa115 | 417 | #define USB_PID_EVOLVEO_XTRATV_STICK 0xa115 |
| 418 | #define USB_PID_HAMA_DVBT_HYBRID 0x2758 | ||
| 417 | #endif | 419 | #endif |
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index b29d4894c2f1..81d7fd4f7776 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c | |||
| @@ -3815,6 +3815,7 @@ struct usb_device_id dib0700_usb_id_table[] = { | |||
| 3815 | { USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_2002E_SE) }, | 3815 | { USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_2002E_SE) }, |
| 3816 | { USB_DEVICE(USB_VID_PCTV, USB_PID_DIBCOM_STK8096PVR) }, | 3816 | { USB_DEVICE(USB_VID_PCTV, USB_PID_DIBCOM_STK8096PVR) }, |
| 3817 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK8096PVR) }, | 3817 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK8096PVR) }, |
| 3818 | { USB_DEVICE(USB_VID_HAMA, USB_PID_HAMA_DVBT_HYBRID) }, | ||
| 3818 | { 0 } /* Terminating entry */ | 3819 | { 0 } /* Terminating entry */ |
| 3819 | }; | 3820 | }; |
| 3820 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | 3821 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); |
| @@ -4379,7 +4380,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 4379 | }, | 4380 | }, |
| 4380 | }, | 4381 | }, |
| 4381 | 4382 | ||
| 4382 | .num_device_descs = 9, | 4383 | .num_device_descs = 10, |
| 4383 | .devices = { | 4384 | .devices = { |
| 4384 | { "Terratec Cinergy HT USB XE", | 4385 | { "Terratec Cinergy HT USB XE", |
| 4385 | { &dib0700_usb_id_table[27], NULL }, | 4386 | { &dib0700_usb_id_table[27], NULL }, |
| @@ -4417,6 +4418,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
| 4417 | { &dib0700_usb_id_table[54], NULL }, | 4418 | { &dib0700_usb_id_table[54], NULL }, |
| 4418 | { NULL }, | 4419 | { NULL }, |
| 4419 | }, | 4420 | }, |
| 4421 | { "Hama DVB=T Hybrid USB Stick", | ||
| 4422 | { &dib0700_usb_id_table[85], NULL }, | ||
| 4423 | { NULL }, | ||
| 4424 | }, | ||
| 4420 | }, | 4425 | }, |
| 4421 | 4426 | ||
| 4422 | .rc.core = { | 4427 | .rc.core = { |
