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>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 6b241cc6c413c6b8652abfb1921d49eb1e4e4569..476ae44a62d2225ab076bd5c01328c3243955f96 100644 (file)
--- 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[] = {
                        .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,
@@ -1169,7 +1169,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/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index dc2019a844ec25b302c287c364139fe2e2ea084a..9a3310748685c9c3ec63c84522272b463d491287 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -96,7 +96,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