From e9314ad63401c89bffe82b165eb7ae630c05a75d Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 8 Jul 2008 17:40:58 +0200 Subject: v4l-dvb: remove support for kernels < 2.6.16 From: Hans Verkuil Phase 4 removes the compatibility support for kernels < 2.6.16. Signed-off-by: Hans Verkuil --- linux/drivers/media/video/cx88/cx88-core.c | 2 -- linux/drivers/media/video/cx88/cx88-i2c.c | 6 ------ linux/drivers/media/video/cx88/cx88-input.c | 4 ---- linux/drivers/media/video/cx88/cx88.h | 6 ------ 4 files changed, 18 deletions(-) (limited to 'linux/drivers/media/video/cx88') diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 6efb1c61a..a63915bdf 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -37,9 +37,7 @@ #include #include "compat.h" #include -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include -#endif #include "cx88.h" #include diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index df615f19a..d7406a994 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -101,14 +101,8 @@ static int attach_inform(struct i2c_client *client) { struct cx88_core *core = i2c_get_adapdata(client->adapter); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", - client->driver->name, client->addr, client->name); -#else dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", client->driver->driver.name, client->addr, client->name); -#endif - return 0; } diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 4796e3ba1..7d174382e 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -362,11 +362,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) input_dev->dev.parent = &pci->dev; #else -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &pci->dev; -#else - input_dev->dev = &pci->dev; -#endif #endif /* record handles to ourself */ ir->core = core; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 161b3cc13..3e4b80617 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -41,9 +41,7 @@ #include "tuner-xc2028.h" #include -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include -#endif #define CX88_VERSION_CODE KERNEL_VERSION(0,0,6) #define UNSET (-1U) @@ -345,11 +343,7 @@ struct cx88_core { /* IR remote control state */ struct cx88_IR *ir; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; -#else - struct semaphore lock; -#endif /* various v4l controls */ u32 freq; -- cgit v1.2.3