diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
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 |