8 files changed, 0 insertions, 43 deletions
diff --git a/linux/drivers/media/video/bt8xx/bt832.c b/linux/drivers/media/video/bt8xx/bt832.c
index e860f7725..b677916bf 100644
--- a/linux/drivers/media/video/bt8xx/bt832.c
+++ b/linux/drivers/media/video/bt8xx/bt832.c
@@ -250,17 +250,9 @@ bt832_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,
-#endif
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.name           = "bt832",
-	.flags          = I2C_DF_NOTIFY,
-#else
 	.driver = {
 		.name   = "bt832",
 	},
-#endif
 	.id             = 0, /* FIXME */
 	.attach_adapter = bt832_probe,
 	.detach_client  = bt832_detach,
@@ -269,9 +261,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
 	.name       = "bt832",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.flags      = I2C_CLIENT_ALLOW_USE,
-#endif
 	.driver     = &driver,
 };
 
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index 4d283be22..df2dfd2ba 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -4868,13 +4868,8 @@ void __init bttv_check_chipset(void)
 	}
 	if (UNSET != latency)
 		printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL,
 				      PCI_DEVICE_ID_INTEL_82441, dev))) {
-#else
-	while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
-				      PCI_DEVICE_ID_INTEL_82441, dev))) {
-#endif
 		unsigned char b;
 		pci_read_config_byte(dev, 0x53, &b);
 		if (bttv_debug)
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 36efd08f8..9877a7124 100644
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
@@ -4545,11 +4545,7 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
 	struct bttv_buffer_set idle;
 	unsigned long flags;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	dprintk("bttv%d: suspend %d\n", btv->c.nr, state.event);
-#else
-	dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
-#endif
 
 	/* stop dma + irqs */
 	spin_lock_irqsave(&btv->s_lock,flags);
diff --git a/linux/drivers/media/video/bt8xx/bttv-gpio.c b/linux/drivers/media/video/bt8xx/bttv-gpio.c
index 9b161b8dd..dce6dae57 100644
--- a/linux/drivers/media/video/bt8xx/bttv-gpio.c
+++ b/linux/drivers/media/video/bt8xx/bttv-gpio.c
@@ -47,7 +47,6 @@ static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 static int bttv_sub_probe(struct device *dev)
 {
 	struct bttv_sub_device *sdev = to_bttv_sub_dev(dev);
@@ -66,17 +65,11 @@ static int bttv_sub_remove(struct device *dev)
 	return 0;
 }
 
-#endif
 struct bus_type bttv_sub_bus_type = {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	.name  = "bttv-sub",
-	.match = &bttv_sub_bus_match,
-#else
 	.name   = "bttv-sub",
 	.match  = &bttv_sub_bus_match,
 	.probe  = bttv_sub_probe,
 	.remove = bttv_sub_remove,
-#endif
 };
 
 static void release_sub_device(struct device *dev)
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c
index 4f48dfb26..bcd2cd240 100644
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c
@@ -277,11 +277,7 @@ static int attach_inform(struct i2c_client *client)
 
 	if (bttv_debug)
 		printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-			btv->c.nr, client->driver->name, client->addr,
-#else
 			btv->c.nr, client->driver->driver.name, client->addr,
-#endif
 			client->name);
 	if (!client->driver->command)
 		return 0;
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c
index ada104826..09dc5ac77 100644
--- a/linux/drivers/media/video/bt8xx/bttv-input.c
+++ b/linux/drivers/media/video/bt8xx/bttv-input.c
@@ -326,11 +326,7 @@ int bttv_input_init(struct bttv *btv)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &btv->c.pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &btv->c.pci->dev;
-#else
-	input_dev->dev = &btv->c.pci->dev;
-#endif
 #endif
 
 	btv->remote = ir;
diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h
index dab61e62e..3441c0226 100644
--- a/linux/drivers/media/video/bt8xx/bttv.h
+++ b/linux/drivers/media/video/bt8xx/bttv.h
@@ -312,10 +312,8 @@ struct bttv_sub_device {
 struct bttv_sub_driver {
 	struct device_driver   drv;
 	char                   wanted[BUS_ID_SIZE];
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	int                    (*probe)(struct bttv_sub_device *sub);
 	void                   (*remove)(struct bttv_sub_device *sub);
-#endif
 };
 #define to_bttv_sub_drv(x) container_of((x), struct bttv_sub_driver, drv)
 
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index c3d1703ac..63d1d4451 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -35,9 +35,7 @@
 #include <linux/videodev.h>
 #include <linux/pci.h>
 #include <linux/input.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include <linux/scatterlist.h>
 #include <asm/io.h>
 #include "compat.h"
@@ -366,11 +364,7 @@ struct bttv {
 
 	/* locking */
 	spinlock_t s_lock;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	struct semaphore lock;
-#else
 	struct mutex lock;
-#endif
 	int resources;
 #ifdef VIDIOC_G_PRIORITY
 	struct v4l2_prio_state prio;