aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/gp8psk.c
diff options
context:
space:
mode:
authorDerek Kelly <user.vdr@gmail.com>2010-10-16 13:23:51 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 05:54:27 -0400
commitbdd1751b49be2860cc8c6a61e8fadda0caf22e5a (patch)
treef32eb607df6b2fb7dfc48cd249ecb37fe8392630 /drivers/media/dvb/dvb-usb/gp8psk.c
parenta90f933507859941c4a58028d7593a80f57895c4 (diff)
[media] gp8psk: Add support for the Genpix Skywalker-2
gp8psk: Add support for the Genpix Skywalker-2 per user requests. Patched against git. Signed-off-by: Derek Kelly <user.vdr@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/gp8psk.c')
-rw-r--r--drivers/media/dvb/dvb-usb/gp8psk.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c
index 45106ac49674..599f8968b16a 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -227,6 +227,7 @@ static struct usb_device_id gp8psk_usb_table [] = {
227 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) }, 227 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) },
228 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) }, 228 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) },
229 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) }, 229 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) },
230 { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_2) },
230/* { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */ 231/* { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */
231 { 0 }, 232 { 0 },
232}; 233};
@@ -258,7 +259,7 @@ static struct dvb_usb_device_properties gp8psk_properties = {
258 259
259 .generic_bulk_ctrl_endpoint = 0x01, 260 .generic_bulk_ctrl_endpoint = 0x01,
260 261
261 .num_device_descs = 3, 262 .num_device_descs = 4,
262 .devices = { 263 .devices = {
263 { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver", 264 { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver",
264 .cold_ids = { &gp8psk_usb_table[0], NULL }, 265 .cold_ids = { &gp8psk_usb_table[0], NULL },
@@ -272,6 +273,10 @@ static struct dvb_usb_device_properties gp8psk_properties = {
272 .cold_ids = { NULL }, 273 .cold_ids = { NULL },
273 .warm_ids = { &gp8psk_usb_table[3], NULL }, 274 .warm_ids = { &gp8psk_usb_table[3], NULL },
274 }, 275 },
276 { .name = "Genpix SkyWalker-2 DVB-S receiver",
277 .cold_ids = { NULL },
278 .warm_ids = { &gp8psk_usb_table[4], NULL },
279 },
275 { NULL }, 280 { NULL },
276 } 281 }
277}; 282};