Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 818fdf34 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cde4362f

drivers/media/video/cx231xx/cx231xx-cards.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/cx231xx/cx231xx-video.c

+2 −0
Original line number Diff line number Diff line
@@ -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"

drivers/media/video/cx231xx/cx231xx.h

+0 −1
Original line number Diff line number Diff line
@@ -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