diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-08 17:40:58 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-08 17:40:58 +0200 |
| commit | e9314ad63401c89bffe82b165eb7ae630c05a75d (patch) | |
| tree | b31a77f9ccfea646348025aae7452e900e61a761 /linux/drivers/media/dvb/cinergyT2 | |
| parent | d784aba6717da44bfef18007146f6d00280e39fe (diff) | |
| download | mediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.gz mediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.bz2 | |
v4l-dvb: remove support for kernels < 2.6.16
From: Hans Verkuil <hverkuil@xs4all.nl>
Phase 4 removes the compatibility support for kernels < 2.6.16.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index e1d76b111..52f104d2b 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -29,9 +29,7 @@ #include <linux/input.h> #include <linux/dvb/frontend.h> #include "compat.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> -#endif #include <linux/mm.h> #include <asm/io.h> @@ -63,15 +61,6 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) -#define dprintk(level, args...) \ -do { \ - if ((debug & level)) { \ - printk("%s: %s(): ", __stringify(KBUILD_MODNAME), \ - __FUNCTION__); \ - printk(args); } \ -} while (0) -#else #define dprintk(level, args...) \ do { \ if ((debug & level)) { \ @@ -79,7 +68,6 @@ do { \ __func__); \ printk(args); } \ } while (0) -#endif enum cinergyt2_ep1_cmd { CINERGYT2_EP1_PID_TABLE_RESET = 0x01, @@ -132,13 +120,8 @@ static struct dvb_frontend_info cinergyt2_fe_info = { struct cinergyt2 { struct dvb_demux demux; struct usb_device *udev; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex sem; struct mutex wq_sem; -#else - struct semaphore sem; - struct semaphore wq_sem; -#endif struct dvb_adapter adapter; struct dvb_device *fedev; struct dmxdev dmxdev; @@ -896,11 +879,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) input_dev->dev.parent = &cinergyt2->udev->dev; #else -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &cinergyt2->udev->dev; -#else - input_dev->dev = &cinergyt2->udev->dev; -#endif #endif err = input_register_device(input_dev); @@ -1141,9 +1120,6 @@ static const struct usb_device_id cinergyt2_table [] __devinitdata = { MODULE_DEVICE_TABLE(usb, cinergyt2_table); static struct usb_driver cinergyt2_driver = { -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - .owner = THIS_MODULE, -#endif .name = "cinergyT2", .probe = cinergyt2_probe, .disconnect = cinergyt2_disconnect, |