The patch number 11037 was added via Mauro Carvalho Chehab <mche...@redhat.com>
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:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
Fix compilation with -git tree
Due to the out-of-tree and in-kernel -git tree, a few changes are required, in
order to properly compile cx231xx with -git.
kernel-sync:
CC: Sri Deevi <srinivasa.de...@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/cx231xx/Kconfig | 44 +++++++-------
linux/drivers/media/video/cx231xx/cx231xx-cards.c | 4 -
linux/drivers/media/video/cx231xx/cx231xx-video.c | 2
linux/drivers/media/video/cx231xx/cx231xx.h | 1
4 files changed, 25 insertions(+), 26 deletions(-)
diff -r 21128a66493c -r 93159ca83ead linux/drivers/media/video/cx231xx/Kconfig
--- a/linux/drivers/media/video/cx231xx/Kconfig Fri Mar 13 20:17:47 2009 -0300
+++ b/linux/drivers/media/video/cx231xx/Kconfig Fri Mar 13 21:07:33 2009 -0300
@@ -1,12 +1,11 @@ config VIDEO_CX231XX
config VIDEO_CX231XX
- tristate "Conexant cx231xx USB video capture support"
- depends on VIDEO_DEV && I2C && INPUT
- select VIDEO_TUNER
- select VIDEO_TVEEPROM
- select VIDEO_IR
- select VIDEOBUF_VMALLOC
- select VIDEO_CX25840
- select VIDEO_CX231XX_ALSA
+ tristate "Conexant cx231xx USB video capture support"
+ depends on VIDEO_DEV && I2C && INPUT
+ select VIDEO_TUNER
+ select VIDEO_TVEEPROM
+ select VIDEO_IR
+ select VIDEOBUF_VMALLOC
+ select VIDEO_CX25840
---help---
This is a video4linux driver for Conexant 231xx USB based TV cards.
@@ -15,21 +14,22 @@ config VIDEO_CX231XX
module will be called cx231xx
config VIDEO_CX231XX_ALSA
- tristate "Conexant Cx231xx ALSA audio module"
- depends on VIDEO_CX231XX && SND
- select SND_PCM
+ tristate "Conexant Cx231xx ALSA audio module"
+ depends on VIDEO_CX231XX && SND
+ select SND_PCM
- ---help---
- This is an ALSA driver for Cx231xx USB based TV cards.
+ ---help---
+ This is an ALSA driver for Cx231xx USB based TV cards.
- To compile this driver as a module, choose M here: the
- module will be called cx231xx-alsa
+ To compile this driver as a module, choose M here: the
+ module will be called cx231xx-alsa
config VIDEO_CX231XX_DVB
- tristate "DVB/ATSC Support for Cx231xx based TV cards"
- depends on VIDEO_CX231XX && DVB_CORE
- select VIDEOBUF_DVB
- select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
- ---help---
- This adds support for DVB cards based on the
- Conexant cx231xx chips.
+ tristate "DVB/ATSC Support for Cx231xx based TV cards"
+ depends on VIDEO_CX231XX && DVB_CORE
+ select VIDEOBUF_DVB
+ select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+
+ ---help---
+ This adds support for DVB cards based on the
+ Conexant cx231xx chips.
diff -r 21128a66493c -r 93159ca83ead
linux/drivers/media/video/cx231xx/cx231xx-cards.c
--- a/linux/drivers/media/video/cx231xx/cx231xx-cards.c Fri Mar 13 20:17:47
2009 -0300
+++ b/linux/drivers/media/video/cx231xx/cx231xx-cards.c Fri Mar 13 21:07:33
2009 -0300
@@ -932,9 +932,7 @@ static int __init cx231xx_module_init(vo
{
int result;
- printk(KERN_INFO DRIVER_NAME " v4l2 driver version %d.%d.%d loaded\n",
- (CX231XX_VERSION_CODE >> 16) & 0xff,
- (CX231XX_VERSION_CODE >> 8) & 0xff, CX231XX_VERSION_CODE & 0xff);
+ printk(KERN_INFO DRIVER_NAME " v4l2 driver loaded.\n");
/* register this driver with the USB subsystem */
result = usb_register(&cx231xx_usb_driver);
diff -r 21128a66493c -r 93159ca83ead
linux/drivers/media/video/cx231xx/cx231xx-video.c
--- a/linux/drivers/media/video/cx231xx/cx231xx-video.c Fri Mar 13 20:17:47
2009 -0300
+++ b/linux/drivers/media/video/cx231xx/cx231xx-video.c Fri Mar 13 21:07:33
2009 -0300
@@ -43,6 +43,8 @@
#include "cx231xx.h"
#include "cx231xx-vbi.h"
+
+#define CX231XX_VERSION_CODE KERNEL_VERSION(0, 0, 1)
#define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.de...@conexant.com>"
#define DRIVER_DESC "Conexant cx231xx based USB video device driver"
diff -r 21128a66493c -r 93159ca83ead linux/drivers/media/video/cx231xx/cx231xx.h
--- a/linux/drivers/media/video/cx231xx/cx231xx.h Fri Mar 13 20:17:47
2009 -0300
+++ b/linux/drivers/media/video/cx231xx/cx231xx.h Fri Mar 13 21:07:33
2009 -0300
@@ -39,7 +39,6 @@
#include "cx231xx-pcb-cfg.h"
#include "cx231xx-conf-reg.h"
-#define CX231XX_VERSION_CODE KERNEL_VERSION(0, 1, 0)
#define DRIVER_NAME "cx231xx"
#define PWR_SLEEP_INTERVAL 5
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/93159ca83eadb8817d101258f1ad921325cf6cdb
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
