diff options
author | Lukas Max Fisch <lukas.fisch@googlemail.com> | 2011-02-08 14:51:45 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:36 -0400 |
commit | 498e677cfd78b098342640f382293782bfa0bd63 (patch) | |
tree | d28e2cb7327034d60c9edc3b00f8c349757d3a56 /drivers | |
parent | 07988007f8dd2827ba1eb39e6e3c5bbb29cfc30b (diff) |
[media] Technisat AirStar TeleStick 2
Based on staging 2.6.39.
This patch is based on Veit Berwig's work.
Signed-off-by: Lukas Fisch <lukas.fisch@gmail.com>
Thanks-to: Veit Berwig <veit.Berwig@fimi.landsh.de>
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 c25b4281cff4..97af266d7f1d 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_NIM9090MD) }, | 2801 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM9090MD) }, |
2802 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM7090) }, | 2802 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_NIM7090) }, |
2803 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7090PVR) }, | 2803 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7090PVR) }, |
2804 | { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, | ||
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 = 2, | 3414 | .num_device_descs = 3, |
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 }, |
@@ -3422,6 +3423,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
3422 | &dib0700_usb_id_table[60], NULL}, | 3423 | &dib0700_usb_id_table[60], NULL}, |
3423 | { NULL }, | 3424 | { NULL }, |
3424 | }, | 3425 | }, |
3426 | { "TechniSat AirStar TeleStick 2", | ||
3427 | { &dib0700_usb_id_table[74], NULL }, | ||
3428 | { NULL }, | ||
3429 | }, | ||
3425 | }, | 3430 | }, |
3426 | 3431 | ||
3427 | .rc.core = { | 3432 | .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 b71540d7e070..3a8b7446b7b0 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -317,5 +317,6 @@ | |||
317 | #define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac | 317 | #define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac |
318 | #define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001 | 318 | #define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001 |
319 | #define USB_PID_TECHNISAT_USB2_HDCI_V2 0x0002 | 319 | #define USB_PID_TECHNISAT_USB2_HDCI_V2 0x0002 |
320 | #define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2 0x0004 | ||
320 | #define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500 | 321 | #define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500 |
321 | #endif | 322 | #endif |