diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |
parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-ids.h')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 029b437caf9a..03dfb9f2fe30 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_WINTV_NOVA_T_USB2_WARM 0x9301 | 129 | #define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301 |
130 | #define USB_PID_HAUPPAUGE_NOVA_T_500 0x9941 | 130 | #define USB_PID_HAUPPAUGE_NOVA_T_500 0x9941 |
131 | #define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950 | 131 | #define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950 |
132 | #define USB_PID_HAUPPAUGE_NOVA_T_500_3 0x8400 | ||
132 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 | 133 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 |
133 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060 | 134 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060 |
134 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070 | 135 | #define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070 |