summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 16:58:04 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 16:58:04 -0300
commit8aa42788bd13fff2951d3ec89d1f2af73932d278 (patch)
tree7e0934d34145a07e5bfbc18693b60f5cef59597b /linux/drivers/media/video/em28xx
parent03cfb9b591a8fd336db578b57ff3907f3a136a5c (diff)
downloadmediapointer-dvb-s2-8aa42788bd13fff2951d3ec89d1f2af73932d278.tar.gz
mediapointer-dvb-s2-8aa42788bd13fff2951d3ec89d1f2af73932d278.tar.bz2
em28xx: Rename #define for Compro VideoMate ForYou/Stereo
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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 'linux/drivers/media/video/em28xx')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index c40f97b3f..44b3ae23d 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -1092,7 +1092,7 @@ struct em28xx_board em28xx_boards[] = {
.amux = 1,
} },
},
- [EM2820_BOARD_COMPRO_VIDEO_MATE] = {
+ [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
.name = "Compro VideoMate ForYou/Stereo",
.vchannels = 2,
.tuner_type = TUNER_LG_PAL_NEW_TAPC,
@@ -1170,7 +1170,7 @@ struct usb_device_id em28xx_id_table [] = {
{ USB_DEVICE(0x185b, 0x2870),
.driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
{ USB_DEVICE(0x185b, 0x2041),
- .driver_info = EM2820_BOARD_COMPRO_VIDEO_MATE },
+ .driver_info = EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU },
{ USB_DEVICE(0x2040, 0x4200),
.driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
{ USB_DEVICE(0x2040, 0x4201),
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 3c3e55d9c..e5e47fe66 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -97,7 +97,7 @@
#define EM2882_BOARD_TERRATEC_HYBRID_XS 55
#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56
#define EM2883_BOARD_KWORLD_HYBRID_A316 57
-#define EM2820_BOARD_COMPRO_VIDEO_MATE 58
+#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4