remove #if'd kernel 2.0 code from drivers/media/video/*
PATCH 1/1 remove #if'd kernel 2.0 code from drivers/media/video/*
The patch below removes some #if'd code for 2.0 and early 2.2 kernels from drivers/media/video/*.
diffstat output:
bw-qcam.c | 2 -- planb.c | 5 ----- zoran.h | 4 ---- zr36120.c | 4 ---- 4 files changed, 15 deletions(-)
cu
Adrian
drivers/media/video/bw-qcam.c renamed from drivers/media/video/bw-qcam.c.old +0 -2
@@ -83,11 +83,9 @@static unsigned int yieldlines=4 ;/* Yield after this many during capture */ static int video_nr =-1 ; -#if LINUX_VERSION_CODE >=0x020117 MODULE_PARM (maxpoll,"i" );MODULE_PARM (yieldlines,"i" );MODULE_PARM (video_nr,"i" ); -#endif static inline int read_lpstatus (struct qcam_device *q) {
drivers/media/video/zr36120.c renamed from drivers/media/video/zr36120.c.old +0 -4
@@ -943,7 +943,6 @@return -EINVAL ; } -#if LINUX_VERSION_CODE >=0x020100 static unsigned int zoran_poll (struct video_device *dev,struct file *file,poll_table *wait) {
@@ -964,7 +963,6 @@return mask; } -#endif /* append a new clipregion to the vector of video_clips */ static
@@ -1745,7 +1743,6 @@return count; } -#if LINUX_VERSION_CODE >=0x020100 static unsigned int vbi_poll (struct video_device *dev,struct file *file,poll_table *wait) {
@@ -1766,7 +1763,6 @@return mask; } -#endif static int vbi_ioctl (struct video_device *dev,unsigned int cmd,void *arg)
drivers/media/video/planb.c renamed from drivers/media/video/planb.c.old +0 -5
@@ -181,12 +181,7 @@/* Let's wait 30msec for this one */ current->state =TASK_INTERRUPTIBLE ; -#if LINUX_VERSION_CODE >=0x02017F schedule_timeout (30 *HZ /1000 ); -#else - current->timeout = jiffies +30 *HZ /1000 ;/* 30 ms */ ; -schedule (); -#endif return (unsigned char )in_8 (&planb_regs->saa_status); }
drivers/media/video/zoran.h renamed from drivers/media/video/zoran.h.old +0 -4
@@ -32,10 +32,6 @@#include <linux/config.h> -#if LINUX_VERSION_CODE <0x20212 -typedef struct wait_queue *wait_queue_head_t ; -#endif -/* The Buz only supports a maximum width of 720, but some V4L applications (e.g. xawtv are more happy with 768). If XAWTV_HACK is defined, we try to fake a device with bigger width */