The patch number 8543 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
---
linux/drivers/media/video/em28xx/em28xx-cards.c | 4 ++--
linux/drivers/media/video/em28xx/em28xx.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -r c72cf06bf557 -r f1cc98803a31
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 15:00:23
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 16:58:04
2008 -0300
@@ -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 -r c72cf06bf557 -r f1cc98803a31 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 15:00:23 2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 16:58:04 2008 -0300
@@ -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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f1cc98803a31ac6c00a64dcb7ece85712ce8415f
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
