diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 06:41:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:03 -0400 |
commit | 818fdf341369110ff91296843797a9431a3d9b31 (patch) | |
tree | b8f78f3af6e8cb83d8310775f34620f081436d37 | |
parent | cde4362f0244a70bab73e37e24f167186bb9a8be (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.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 1 |
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 a1f6ed645add..27cf51b78d6d 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) | |||
964 | { | 964 | { |
965 | int result; | 965 | int result; |
966 | 966 | ||
967 | printk(KERN_INFO DRIVER_NAME " v4l2 driver version %d.%d.%d loaded\n", | 967 | printk(KERN_INFO DRIVER_NAME " v4l2 driver loaded.\n"); |
968 | (CX231XX_VERSION_CODE >> 16) & 0xff, | ||
969 | (CX231XX_VERSION_CODE >> 8) & 0xff, CX231XX_VERSION_CODE & 0xff); | ||
970 | 968 | ||
971 | /* register this driver with the USB subsystem */ | 969 | /* register this driver with the USB subsystem */ |
972 | result = usb_register(&cx231xx_usb_driver); | 970 | 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 89cf57c5056a..47e2da8ae19a 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -44,6 +44,8 @@ | |||
44 | #include "cx231xx.h" | 44 | #include "cx231xx.h" |
45 | #include "cx231xx-vbi.h" | 45 | #include "cx231xx-vbi.h" |
46 | 46 | ||
47 | #define CX231XX_VERSION_CODE KERNEL_VERSION(0, 0, 1) | ||
48 | |||
47 | #define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.deevi@conexant.com>" | 49 | #define DRIVER_AUTHOR "Srinivasa Deevi <srinivasa.deevi@conexant.com>" |
48 | #define DRIVER_DESC "Conexant cx231xx based USB video device driver" | 50 | #define DRIVER_DESC "Conexant cx231xx based USB video device driver" |
49 | 51 | ||
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index d98b36d772bd..d4fba028db4a 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "cx231xx-pcb-config.h" | 37 | #include "cx231xx-pcb-config.h" |
38 | #include "cx231xx-conf-reg.h" | 38 | #include "cx231xx-conf-reg.h" |
39 | 39 | ||
40 | #define CX231XX_VERSION_CODE KERNEL_VERSION(0, 1, 0) | ||
41 | #define DRIVER_NAME "cx231xx" | 40 | #define DRIVER_NAME "cx231xx" |
42 | #define PWR_SLEEP_INTERVAL 5 | 41 | #define PWR_SLEEP_INTERVAL 5 |
43 | 42 | ||