5 files changed, 0 insertions, 33 deletions
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 0143c8b28..c5c19a2e3 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -797,15 +797,9 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	.owner          = THIS_MODULE,
-	.name           = "saa6752hs",
-	.flags          = I2C_DF_NOTIFY,
-#else
 	.driver = {
 		.name   = "saa6752hs",
 	},
-#endif
 	.id             = I2C_DRIVERID_SAA6752HS,
 	.attach_adapter = saa6752hs_probe,
 	.detach_client  = saa6752hs_detach,
@@ -815,9 +809,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
 	.name       = "saa6752hs",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.flags      = I2C_CLIENT_ALLOW_USE,
-#endif
 	.driver     = &driver,
 };
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 511941bca..8f3d280af 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -29,9 +29,7 @@
 #include <linux/sound.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include <linux/dma-mapping.h>
 #include <linux/pm.h>
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index 610e506b5..bdec276e0 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -331,11 +331,7 @@ static int attach_inform(struct i2c_client *client)
 	struct saa7134_dev *dev = client->adapter->algo_data;
 
 	d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-		client->driver->name, client->addr, client->name);
-#else
 		client->driver->driver.name, client->addr, client->name);
-#endif
 	if (client->addr == 0x20 && client->driver && client->driver->command)
 		dev->mpeg_i2c_client = client;
 
@@ -349,11 +345,7 @@ static int attach_inform(struct i2c_client *client)
 		{
 			struct IR_i2c *ir = i2c_get_clientdata(client);
 			d1printk("%s i2c IR detected (%s).\n",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-				 client->driver->name,ir->phys);
-#else
 				 client->driver->driver.name, ir->phys);
-#endif
 			saa7134_set_i2c_ir(dev,ir);
 			break;
 		}
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index c12184a38..0ad81e690 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -476,11 +476,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &dev->pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &dev->pci->dev;
-#else
-	input_dev->dev = &dev->pci->dev;
-#endif
 #endif
 
 	dev->remote = ir;
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 08bc1d0fa..6afbc0c57 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -29,9 +29,7 @@
 #include <linux/input.h>
 #include <linux/notifier.h>
 #include <linux/delay.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <asm/io.h>
 
@@ -415,11 +413,7 @@ struct saa7134_fh {
 
 /* dmasound dsp status */
 struct saa7134_dmasound {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex               lock;
-#else
-	struct semaphore           lock;
-#endif
 	int                        minor_mixer;
 	int                        minor_dsp;
 	unsigned int               users_dsp;
@@ -473,11 +467,7 @@ struct saa7134_mpeg_ops {
 /* global device status */
 struct saa7134_dev {
 	struct list_head           devlist;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex               lock;
-#else
-	struct semaphore           lock;
-#endif
 	spinlock_t                 slock;
 	struct v4l2_prio_state     prio;
 	/* workstruct for loading modules */