]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/video/em28xx/em28xx.h
V4L/DVB (8541): em28xx: HVR-950 entry is duplicated.
[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx.h
index 746a7acaf9d014aa166fd64a137c4e1d56741b06..dc2019a844ec25b302c287c364139fe2e2ea084a 100644 (file)
@@ -54,7 +54,7 @@
 #define EM2880_BOARD_TERRATEC_PRODIGY_XS       13
 #define EM2820_BOARD_PROLINK_PLAYTV_USB2       14
 #define EM2800_BOARD_VGEAR_POCKETTV             15
-#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950   16
+#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950   16
 #define EM2880_BOARD_PINNACLE_PCTV_HD_PRO      17
 #define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2        18
 #define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19
@@ -96,8 +96,7 @@
 #define EM2882_BOARD_TERRATEC_HYBRID_XS                  55
 #define EM2882_BOARD_PINNACLE_HYBRID_PRO         56
 #define EM2883_BOARD_KWORLD_HYBRID_A316                  57
-#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950     58
-#define EM2820_BOARD_COMPRO_VIDEO_MATE           59
+#define EM2820_BOARD_COMPRO_VIDEO_MATE           58
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4