diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 14:58:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 14:58:58 -0300 |
| commit | b36bfcb16f614a7e44f2a56e8b91ccdf70facb36 (patch) | |
| tree | f4cf40515d7d20bfb089eae5fde3d57856495255 /linux/drivers/media/video/em28xx/em28xx.h | |
| parent | 6c3a536a4c83388df468f1e2948bb0a03d93b949 (diff) | |
| download | mediapointer-dvb-s2-b36bfcb16f614a7e44f2a56e8b91ccdf70facb36.tar.gz mediapointer-dvb-s2-b36bfcb16f614a7e44f2a56e8b91ccdf70facb36.tar.bz2 | |
em28xx: HVR-950 entry is duplicated.
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this
issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx.h')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index 06c94f77d..3c3e55d9c 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -55,7 +55,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 @@ -97,8 +97,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 |