From ed559edf35bdefb91c7eba5ea3dfd1e939aaa782 Mon Sep 17 00:00:00 2001 From: Sri Deevi Date: Fri, 13 Mar 2009 18:35:14 -0300 Subject: V4L/DVB (11038): Fix the issue with audio module & correction of Names The audio module requested in driver differs with module created by Makefile. Makefile is corrected to create the same module name required by driver. Also, corrected the strings that shows wrong name. Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx231xx/Makefile | 4 +++- drivers/media/video/cx231xx/cx231xx-cards.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'drivers/media') diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile index 1dad9361993..755dd0ce65f 100644 --- a/drivers/media/video/cx231xx/Makefile +++ b/drivers/media/video/cx231xx/Makefile @@ -1,8 +1,10 @@ cx231xx-objs := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \ cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o +cx231xx-alsa-objs := cx231xx-audio.o + obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o -obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-audio.o +obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o EXTRA_CFLAGS += -Idrivers/media/video diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index c5230b5df90..6a67c2dca9a 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -168,11 +168,11 @@ const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); /* table of devices that work with this driver */ struct usb_device_id cx231xx_id_table[] = { - {USB_DEVICE(0x0572, 0x58A0), + {USB_DEVICE(0x0572, 0x5A3C), .driver_info = CX231XX_BOARD_UNKNOWN}, {USB_DEVICE(0x0572, 0x58A2), .driver_info = CX231XX_BOARD_CNXT_RDE_250}, - {USB_DEVICE(0x0572, 0x5A3C), + {USB_DEVICE(0x0572, 0x58A1), .driver_info = CX231XX_BOARD_CNXT_RDU_250}, {}, }; @@ -321,11 +321,11 @@ void cx231xx_card_setup(struct cx231xx *dev) switch (dev->model) { case CX231XX_BOARD_CNXT_RDE_250: /* do card specific GPIO settings if required */ - cx231xx_info("Board is Conexnat RDE 250\n"); + cx231xx_info("Board is Conexant RDE 250\n"); break; case CX231XX_BOARD_CNXT_RDU_250: /* do card specific GPIO settings if required */ - cx231xx_info("Board is Conexnat RDU 250\n"); + cx231xx_info("Board is Conexant RDU 250\n"); break; } -- cgit v1.2.3