5 files changed, 0 insertions, 22 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c
index b8a5c61ce..adf2a6552 100644
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c
@@ -55,11 +55,7 @@ struct em28xx_dvb {
 	struct dvb_frontend        *frontend;
 
 	/* feed count management */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
 	struct mutex               lock;
-#else
-	struct semaphore           lock;
-#endif
 	int                        nfeeds;
 
 	/* general boilerplate stuff */
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index 4d6f650da..97853384c 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -519,9 +519,6 @@ static struct i2c_adapter em28xx_adap_template = {
 
 static struct i2c_client em28xx_client_template = {
 	.name = "em28xx internal",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2, 6, 15)
-	.flags = I2C_CLIENT_ALLOW_USE,
-#endif
 };
 
 /* ----------------------------------------------------------- */
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index e83e3bebd..8d21eaad9 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -205,11 +205,7 @@ void em28xx_register_snapshot_button(struct em28xx *dev)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
 	input_dev->dev.parent = &dev->udev->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
 	input_dev->cdev.dev = &dev->udev->dev;
-#else
-	input_dev->dev = &dev->udev->dev;
-#endif
 #endif
 
 	err = input_register_device(input_dev);
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 5929d0860..4f7a51e66 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -34,9 +34,7 @@
 #include <linux/i2c.h>
 #include <linux/version.h>
 #include <linux/mm.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
 #include <linux/mutex.h>
-#endif
 
 #include "em28xx.h"
 #include <media/v4l2-common.h>
@@ -2341,9 +2339,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 }
 
 static struct usb_driver em28xx_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2, 6, 15)
-	.owner = THIS_MODULE,
-#endif
 	.name = "em28xx",
 	.probe = em28xx_usb_probe,
 	.disconnect = em28xx_usb_disconnect,
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index 18b3bc134..6db96db0f 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -30,9 +30,7 @@
 #include <media/videobuf-vmalloc.h>
 
 #include <linux/i2c.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
 #include <linux/mutex.h>
-#endif
 #include <media/ir-kbd-i2c.h>
 #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
 #include <media/videobuf-dvb.h>
@@ -395,11 +393,7 @@ struct em28xx {
 	struct work_struct         request_module_wk;
 
 	/* locks */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
 	struct mutex lock;
-#else
-	struct semaphore lock, fileop_lock;
-#endif
 	/* spinlock_t queue_lock; */
 	struct list_head inqueue, outqueue;
 	wait_queue_head_t open, wait_frame, wait_stream;