diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-01 09:58:54 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-01 09:58:54 -0200 |
| commit | c85158079d46858c290413a5f8ee048cfb6057a9 (patch) | |
| tree | 0114f1176fc878019bad777a72b9bcbebeb6f880 /linux/drivers/media/dvb | |
| parent | 536780a1c21f6c46a109ada4c4e0e1a6a1c9a1f2 (diff) | |
| parent | 8e0d44f9e05b60c1c0c050132cc6af9d09e6206e (diff) | |
| download | mediapointer-dvb-s2-c85158079d46858c290413a5f8ee048cfb6057a9.tar.gz mediapointer-dvb-s2-c85158079d46858c290413a5f8ee048cfb6057a9.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 6a55ea222..299382dcb 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -32,8 +32,8 @@ #define USB_VID_PINNACLE 0x2304 #define USB_VID_VISIONPLUS 0x13d3 #define USB_VID_TWINHAN 0x1822 -#define USB_VID_UNIWILL 0x1584 #define USB_VID_ULTIMA_ELECTRONIC 0x05d8 +#define USB_VID_UNIWILL 0x1584 #define USB_VID_WIDEVIEW 0x14aa /* Product IDs */ |