diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:19:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:19:50 -0200 |
| commit | eaf6bdcc22aa742bdec32708647fe07d891631db (patch) | |
| tree | 409a735f957b7f172cd337276098cfe1a1ce9636 /linux/drivers/media/video/ivtv/ivtv-cards.h | |
| parent | b9311eb8cce1ff6e214edd27ca2ad41ffa5cbeb2 (diff) | |
| parent | f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86 (diff) | |
| download | mediapointer-dvb-s2-eaf6bdcc22aa742bdec32708647fe07d891631db.tar.gz mediapointer-dvb-s2-eaf6bdcc22aa742bdec32708647fe07d891631db.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-cards.h')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-cards.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-cards.h b/linux/drivers/media/video/ivtv/ivtv-cards.h index ff46e5ae8..881b04473 100644 --- a/linux/drivers/media/video/ivtv/ivtv-cards.h +++ b/linux/drivers/media/video/ivtv/ivtv-cards.h @@ -45,7 +45,9 @@ #define IVTV_CARD_PG600V2 18 /* Yuan PG600V2/GotView PCI DVD Lite */ #define IVTV_CARD_CLUB3D 19 /* Club3D ZAP-TV1x01 */ #define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */ -#define IVTV_CARD_LAST 20 +#define IVTV_CARD_ASUS_FALCON2 21 /* ASUS Falcon2 */ +#define IVTV_CARD_AVER_PVR150PLUS 22 /* AVerMedia PVR-150 Plus */ +#define IVTV_CARD_LAST 22 /* Variants of existing cards but with the same PCI IDs. The driver detects these based on other device information. @@ -69,6 +71,7 @@ #define IVTV_PCI_ID_HAUPPAUGE_ALT1 0x0270 #define IVTV_PCI_ID_HAUPPAUGE_ALT2 0x4070 #define IVTV_PCI_ID_ADAPTEC 0x9005 +#define IVTV_PCI_ID_ASUSTEK 0x1043 #define IVTV_PCI_ID_AVERMEDIA 0x1461 #define IVTV_PCI_ID_YUAN1 0x12ab #define IVTV_PCI_ID_YUAN2 0xff01 @@ -96,7 +99,8 @@ #define IVTV_HW_SAA717X (1 << 12) #define IVTV_HW_WM8739 (1 << 13) #define IVTV_HW_VP27SMPX (1 << 14) -#define IVTV_HW_GPIO (1 << 15) +#define IVTV_HW_M52790 (1 << 15) +#define IVTV_HW_GPIO (1 << 16) #define IVTV_HW_SAA711X (IVTV_HW_SAA7115 | IVTV_HW_SAA7114) |