aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-13 07:41:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 21:44:03 -0300
commit818fdf341369110ff91296843797a9431a3d9b31 (patch)
treeb8f78f3af6e8cb83d8310775f34620f081436d37
parentcde4362f0244a70bab73e37e24f167186bb9a8be (diff)
V4L/DVB (10957a): cx231xx: Fix compilation breakage
Only cx231xx-video needs linux/version.h, due to KERNEL_VERSION macro, that is used by V4L2 API. This patch moves the KERNEL_VERSION to its proper place and starts with 0,0,1. There are still much more to be fixed on later patches Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c4
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx.h1
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index a1f6ed645ad..27cf51b78d6 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -964,9 +964,7 @@ static int __init cx231xx_module_init(void)
{
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 --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 89cf57c5056..47e2da8ae19 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -44,6 +44,8 @@
#include "cx231xx.h"
#include "cx231xx-vbi.h"
+#define CX231XX_VERSION_CODE KERNEL_VERSION(0, 0, 1)
+
#define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.deevi@conexant.com>"
#define DRIVER_DESC "Conexant cx231xx based USB video device driver"
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index d98b36d772b..d4fba028db4 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -37,7 +37,6 @@
#include "cx231xx-pcb-config.h"
#include "cx231xx-conf-reg.h"
-#define CX231XX_VERSION_CODE KERNEL_VERSION(0, 1, 0)
#define DRIVER_NAME "cx231xx"
#define PWR_SLEEP_INTERVAL 5