aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 13:58:58 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 17:07:50 -0400
commit10ac6603613d46a43a4544fbbe9581e50879bd45 (patch)
tree857987542eb360626689190c0cc519c395e0e6ad /drivers/media/video/em28xx/em28xx.h
parentd3603341e2f3c39f017f8df4b1cd734aeb0d453b (diff)
V4L/DVB (8541): em28xx: HVR-950 entry is duplicated.
Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 746a7acaf9d0..dc2019a844ec 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -54,7 +54,7 @@
54#define EM2880_BOARD_TERRATEC_PRODIGY_XS 13 54#define EM2880_BOARD_TERRATEC_PRODIGY_XS 13
55#define EM2820_BOARD_PROLINK_PLAYTV_USB2 14 55#define EM2820_BOARD_PROLINK_PLAYTV_USB2 14
56#define EM2800_BOARD_VGEAR_POCKETTV 15 56#define EM2800_BOARD_VGEAR_POCKETTV 15
57#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 16 57#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 16
58#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO 17 58#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO 17
59#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 18 59#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 18
60#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA 19 60#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA 19
@@ -96,8 +96,7 @@
96#define EM2882_BOARD_TERRATEC_HYBRID_XS 55 96#define EM2882_BOARD_TERRATEC_HYBRID_XS 55
97#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56 97#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56
98#define EM2883_BOARD_KWORLD_HYBRID_A316 57 98#define EM2883_BOARD_KWORLD_HYBRID_A316 57
99#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 58 99#define EM2820_BOARD_COMPRO_VIDEO_MATE 58
100#define EM2820_BOARD_COMPRO_VIDEO_MATE 59
101 100
102/* Limits minimum and default number of buffers */ 101/* Limits minimum and default number of buffers */
103#define EM28XX_MIN_BUF 4 102#define EM28XX_MIN_BUF 4