diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-06-23 21:48:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:26 -0400 |
commit | 33fb1681c61456898b986405a13222a913f10a4a (patch) | |
tree | b089303dc2c7584d8b8d4de77ebb92e82fc0c088 /drivers/media/dvb | |
parent | 8d009a0c41475a482aca17d2a9fc8e6965f2fdf9 (diff) |
[media] dib0700: add USB id for PCTV 340eSE
Add the board profile for the PCTV 340eSE, since that's what I have here
for development.
[mchehab@redhat.com: rebased on the top of the current tree]
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index a79c4ea9d7ed..66c6de98c97b 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -2839,6 +2839,7 @@ struct usb_device_id dib0700_usb_id_table[] = { | |||
2839 | { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, | 2839 | { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) }, |
2840 | /* 75 */{ USB_DEVICE(USB_VID_MEDION, USB_PID_CREATIX_CTX1921) }, | 2840 | /* 75 */{ USB_DEVICE(USB_VID_MEDION, USB_PID_CREATIX_CTX1921) }, |
2841 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV340E) }, | 2841 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV340E) }, |
2842 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV340E_SE) }, | ||
2842 | { 0 } /* Terminating entry */ | 2843 | { 0 } /* Terminating entry */ |
2843 | }; | 2844 | }; |
2844 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | 2845 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); |
@@ -3823,12 +3824,16 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
3823 | }, | 3824 | }, |
3824 | }, | 3825 | }, |
3825 | 3826 | ||
3826 | .num_device_descs = 1, | 3827 | .num_device_descs = 2, |
3827 | .devices = { | 3828 | .devices = { |
3828 | { "Pinnacle PCTV 340e HD Pro USB Stick", | 3829 | { "Pinnacle PCTV 340e HD Pro USB Stick", |
3829 | { &dib0700_usb_id_table[76], NULL }, | 3830 | { &dib0700_usb_id_table[76], NULL }, |
3830 | { NULL }, | 3831 | { NULL }, |
3831 | }, | 3832 | }, |
3833 | { "Pinnacle PCTV Hybrid Stick Solo", | ||
3834 | { &dib0700_usb_id_table[77], NULL }, | ||
3835 | { NULL }, | ||
3836 | }, | ||
3832 | }, | 3837 | }, |
3833 | .rc.core = { | 3838 | .rc.core = { |
3834 | .rc_interval = DEFAULT_RC_INTERVAL, | 3839 | .rc_interval = DEFAULT_RC_INTERVAL, |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 9b40f12cfd22..20e47882827b 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -228,9 +228,10 @@ | |||
228 | #define USB_PID_PINNACLE_PCTV72E 0x0236 | 228 | #define USB_PID_PINNACLE_PCTV72E 0x0236 |
229 | #define USB_PID_PINNACLE_PCTV73E 0x0237 | 229 | #define USB_PID_PINNACLE_PCTV73E 0x0237 |
230 | #define USB_PID_PINNACLE_PCTV310E 0x3211 | 230 | #define USB_PID_PINNACLE_PCTV310E 0x3211 |
231 | #define USB_PID_PINNACLE_PCTV340E 0x023d | ||
232 | #define USB_PID_PINNACLE_PCTV801E 0x023a | 231 | #define USB_PID_PINNACLE_PCTV801E 0x023a |
233 | #define USB_PID_PINNACLE_PCTV801E_SE 0x023b | 232 | #define USB_PID_PINNACLE_PCTV801E_SE 0x023b |
233 | #define USB_PID_PINNACLE_PCTV340E 0x023d | ||
234 | #define USB_PID_PINNACLE_PCTV340E_SE 0x023e | ||
234 | #define USB_PID_PINNACLE_PCTV73A 0x0243 | 235 | #define USB_PID_PINNACLE_PCTV73A 0x0243 |
235 | #define USB_PID_PINNACLE_PCTV73ESE 0x0245 | 236 | #define USB_PID_PINNACLE_PCTV73ESE 0x0245 |
236 | #define USB_PID_PINNACLE_PCTV74E 0x0246 | 237 | #define USB_PID_PINNACLE_PCTV74E 0x0246 |