aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 15:58:04 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 17:07:56 -0400
commitee281b856d4e4921da24387ab116bb0855c2efaa (patch)
tree810f931e77a2f21ae6eda2a9e27def7d12d0ba72 /drivers/media
parentfe43ef894c282dbfa963872eef577bab46a178fb (diff)
V4L/DVB (8543): em28xx: Rename #define for Compro VideoMate ForYou/Stereo
There are two videomate boards supporded by em28xx. The names are almost identical. This patch renames one of such entries to something else. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 6b241cc6c41..476ae44a62d 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1091,7 +1091,7 @@ struct em28xx_board em28xx_boards[] = {
1091 .amux = 1, 1091 .amux = 1,
1092 } }, 1092 } },
1093 }, 1093 },
1094 [EM2820_BOARD_COMPRO_VIDEO_MATE] = { 1094 [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
1095 .name = "Compro VideoMate ForYou/Stereo", 1095 .name = "Compro VideoMate ForYou/Stereo",
1096 .vchannels = 2, 1096 .vchannels = 2,
1097 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 1097 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
@@ -1169,7 +1169,7 @@ struct usb_device_id em28xx_id_table [] = {
1169 { USB_DEVICE(0x185b, 0x2870), 1169 { USB_DEVICE(0x185b, 0x2870),
1170 .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE }, 1170 .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
1171 { USB_DEVICE(0x185b, 0x2041), 1171 { USB_DEVICE(0x185b, 0x2041),
1172 .driver_info = EM2820_BOARD_COMPRO_VIDEO_MATE }, 1172 .driver_info = EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU },
1173 { USB_DEVICE(0x2040, 0x4200), 1173 { USB_DEVICE(0x2040, 0x4200),
1174 .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, 1174 .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
1175 { USB_DEVICE(0x2040, 0x4201), 1175 { USB_DEVICE(0x2040, 0x4201),
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index dc2019a844e..9a331074868 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -96,7 +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 EM2820_BOARD_COMPRO_VIDEO_MATE 58 99#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
100 100
101/* Limits minimum and default number of buffers */ 101/* Limits minimum and default number of buffers */
102#define EM28XX_MIN_BUF 4 102#define EM28XX_MIN_BUF 4