aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-25 04:20:02 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:05:17 -0500
commit13b83b5d516abe2610ae7812267d7d322050bf68 (patch)
tree5843450ae727d36b7697b4ae05fe6a50ce69a99f /drivers/media
parentc7637b1a31bb0470e1247f1923a323c90927ac37 (diff)
V4L/DVB (7069): Support for myTV.t
Here's a roll-up which provides support for both this and the myTV.t. Signed-off-by: Darren Salt <linux@youmustbejoking.demon.co.uk> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
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 4c8c71206581..36d29f9d2f68 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -876,6 +876,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
876 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) }, 876 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) },
877 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) }, 877 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) },
878/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) }, 878/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) },
879 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MYTV_T) },
879 { 0 } /* Terminating entry */ 880 { 0 } /* Terminating entry */
880}; 881};
881MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 882MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1061,7 +1062,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1061 }, 1062 },
1062 }, 1063 },
1063 1064
1064 .num_device_descs = 5, 1065 .num_device_descs = 6,
1065 .devices = { 1066 .devices = {
1066 { "DiBcom STK7070P reference design", 1067 { "DiBcom STK7070P reference design",
1067 { &dib0700_usb_id_table[15], NULL }, 1068 { &dib0700_usb_id_table[15], NULL },
@@ -1083,6 +1084,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1083 { &dib0700_usb_id_table[25], NULL }, 1084 { &dib0700_usb_id_table[25], NULL },
1084 { NULL }, 1085 { NULL },
1085 }, 1086 },
1087 { "Hauppauge Nova-T MyTV.t",
1088 { &dib0700_usb_id_table[26], NULL },
1089 { NULL },
1090 },
1086 }, 1091 },
1087 1092
1088 .rc_interval = DEFAULT_RC_INTERVAL, 1093 .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 35df40f5f7ef..aa4844ef875e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -129,6 +129,7 @@
129#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 129#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050
130#define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060 130#define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060
131#define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070 131#define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070
132#define USB_PID_HAUPPAUGE_MYTV_T 0x7080
132#define USB_PID_HAUPPAUGE_NOVA_TD_STICK 0x9580 133#define USB_PID_HAUPPAUGE_NOVA_TD_STICK 0x9580
133#define USB_PID_AVERMEDIA_EXPRESS 0xb568 134#define USB_PID_AVERMEDIA_EXPRESS 0xb568
134#define USB_PID_AVERMEDIA_VOLAR 0xa807 135#define USB_PID_AVERMEDIA_VOLAR 0xa807