diff options
author | Stéphane Elmaleh <stephane.elmaleh@laposte.net> | 2011-05-21 06:33:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-21 06:38:55 -0400 |
commit | d1402307c23cfeafce2313d936a4a990eb8783f7 (patch) | |
tree | ab6c15ed36f35e132af55ff5d5d28a8482d7cf0d /drivers | |
parent | 423c79e3fed751c244aceb39031920669e1d039a (diff) |
[media] support for medion dvb stick 1660:1921
[mchehab@redhat.com: The same patch were sent by Alf and by Randoslaw.
I've applied the oldest version, just fixing the entry index]
Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Tested-by: James Huk <huk256@gmail.com>
Tested-by: Alf Fahland <alf-f@gmx.de>
Signed-off-by: Radoslaw Warowny <radoslaww@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 5c01d25875ed..c519ad5eb731 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -2801,6 +2801,7 @@ struct usb_device_id dib0700_usb_id_table[] = { | |||
2801 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM7090) }, | 2801 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM7090) }, |
2802 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7090PVR) }, | 2802 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7090PVR) }, |
2803 | { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, | 2803 | { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, |
2804 | /* 75 */{ USB_DEVICE(USB_VID_MEDION, USB_PID_CREATIX_CTX1921) }, | ||
2804 | { 0 } /* Terminating entry */ | 2805 | { 0 } /* Terminating entry */ |
2805 | }; | 2806 | }; |
2806 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | 2807 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); |
@@ -3410,7 +3411,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
3410 | }, | 3411 | }, |
3411 | }, | 3412 | }, |
3412 | 3413 | ||
3413 | .num_device_descs = 3, | 3414 | .num_device_descs = 4, |
3414 | .devices = { | 3415 | .devices = { |
3415 | { "DiBcom STK7770P reference design", | 3416 | { "DiBcom STK7770P reference design", |
3416 | { &dib0700_usb_id_table[59], NULL }, | 3417 | { &dib0700_usb_id_table[59], NULL }, |
@@ -3426,6 +3427,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
3426 | { &dib0700_usb_id_table[74], NULL }, | 3427 | { &dib0700_usb_id_table[74], NULL }, |
3427 | { NULL }, | 3428 | { NULL }, |
3428 | }, | 3429 | }, |
3430 | { "Medion CTX1921 DVB-T USB", | ||
3431 | { &dib0700_usb_id_table[75], NULL }, | ||
3432 | { NULL }, | ||
3433 | }, | ||
3429 | }, | 3434 | }, |
3430 | 3435 | ||
3431 | .rc.core = { | 3436 | .rc.core = { |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 3a8b7446b7b0..21b15495d2d7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -91,6 +91,7 @@ | |||
91 | #define USB_PID_COMPRO_VIDEOMATE_U500_PC 0x1e80 | 91 | #define USB_PID_COMPRO_VIDEOMATE_U500_PC 0x1e80 |
92 | #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397 | 92 | #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397 |
93 | #define USB_PID_CONEXANT_D680_DMB 0x86d6 | 93 | #define USB_PID_CONEXANT_D680_DMB 0x86d6 |
94 | #define USB_PID_CREATIX_CTX1921 0x1921 | ||
94 | #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 | 95 | #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 |
95 | #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 | 96 | #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 |
96 | #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 | 97 | #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 |