4 files changed, 0 insertions, 51 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.h b/linux/drivers/media/dvb/bt8xx/bt878.h
index 9bef8bbdb..8319457f7 100644
--- a/linux/drivers/media/dvb/bt8xx/bt878.h
+++ b/linux/drivers/media/dvb/bt8xx/bt878.h
@@ -26,9 +26,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "bt848.h"
 #include "bttv.h"
@@ -107,11 +105,7 @@
 extern int bt878_num;
 
 struct bt878 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex gpio_lock;
-#else
-	struct semaphore gpio_lock;
-#endif
 	unsigned int nr;
 	unsigned int bttv_nr;
 	struct i2c_adapter *adapter;
diff --git a/linux/drivers/media/dvb/bt8xx/dst_common.h b/linux/drivers/media/dvb/bt8xx/dst_common.h
index 47b62ef3c..40e6a88a9 100644
--- a/linux/drivers/media/dvb/bt8xx/dst_common.h
+++ b/linux/drivers/media/dvb/bt8xx/dst_common.h
@@ -25,9 +25,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include "bt878.h"
 
 #include "dst_ca.h"
@@ -140,11 +138,7 @@ struct dst_state {
 	u8 board_info[8];
 	u32 tuner_type;
 	char *tuner_name;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex dst_mutex;
-#else
-	struct semaphore dst_mutex;
-#endif
 	u8 fw_name[8];
 	struct dvb_device *dst_ca;
 };
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 27d092448..5fb213cf9 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -804,15 +804,8 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-static int dvb_bt8xx_probe(struct device *dev)
-#else
 static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
-#endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	struct bttv_sub_device *sub = to_bttv_sub_dev(dev);
-#endif
 	struct dvb_bt8xx_card *card;
 	struct pci_dev* bttv_pci_dev;
 	int ret;
@@ -921,25 +914,13 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
 		return ret;
 	}
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	dev_set_drvdata(dev, card);
-#else
 	dev_set_drvdata(&sub->dev, card);
-#endif
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-static int dvb_bt8xx_remove(struct device *dev)
-#else
 static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
-#endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	struct dvb_bt8xx_card *card = dev_get_drvdata(dev);
-#else
 	struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
-#endif
 
 	dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
 
@@ -957,25 +938,12 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
 	dvb_unregister_adapter(&card->dvb_adapter);
 
 	kfree(card);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	return (0);
-#endif
 }
 
 static struct bttv_sub_driver driver = {
 	.drv = {
 		.name		= "dvb-bt8xx",
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-		.probe		= dvb_bt8xx_probe,
-		.remove		= dvb_bt8xx_remove,
-		/* FIXME:
-		 * .shutdown	= dvb_bt8xx_shutdown,
-		 * .suspend	= dvb_bt8xx_suspend,
-		 * .resume	= dvb_bt8xx_resume,
-		 */
-#endif
 	},
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	.probe		= dvb_bt8xx_probe,
 	.remove		= dvb_bt8xx_remove,
 	/* FIXME:
@@ -983,7 +951,6 @@ static struct bttv_sub_driver driver = {
 	 * .suspend	= dvb_bt8xx_suspend,
 	 * .resume	= dvb_bt8xx_resume,
 	 */
-#endif
 };
 
 static int __init dvb_bt8xx_init(void)
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 6b4ed25c7..a87b3a417 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -27,9 +27,7 @@
 
 #include <linux/i2c.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include "dvbdev.h"
 #include "dvb_net.h"
 #include "bttv.h"
@@ -44,11 +42,7 @@
 #include "tuner-simple.h"
 
 struct dvb_bt8xx_card {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 	int nfeeds;
 	char card_name[32];
 	struct dvb_adapter dvb_adapter;