Skip to content

Commit

Permalink
V4L/DVB (8543): em28xx: Rename #define for Compro VideoMate ForYou/St…
Browse files Browse the repository at this point in the history
…ereo

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>
  • Loading branch information
Mauro Carvalho Chehab committed Jul 27, 2008
1 parent fe43ef8 commit ee281b8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/em28xx/em28xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ee281b8

Please sign in to comment.