9 files changed, 0 insertions, 44 deletions
diff --git a/linux/drivers/media/radio/miropcm20-rds-core.c b/linux/drivers/media/radio/miropcm20-rds-core.c
index a29942cdf..e18e2a4a8 100644
--- a/linux/drivers/media/radio/miropcm20-rds-core.c
+++ b/linux/drivers/media/radio/miropcm20-rds-core.c
@@ -19,9 +19,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <asm/io.h>
 #include "oss/aci.h"
@@ -29,11 +27,7 @@
 
 #define DEBUG 0
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 static struct mutex aci_rds_mutex;
-#else
-static struct semaphore aci_rds_mutex;
-#endif
 
 #define RDS_DATASHIFT          2   /* Bit 2 */
 #define RDS_DATAMASK        (1 << RDS_DATASHIFT)
diff --git a/linux/drivers/media/radio/radio-aimslab.c b/linux/drivers/media/radio/radio-aimslab.c
index 7b9afd7e6..06313a334 100644
--- a/linux/drivers/media/radio/radio-aimslab.c
+++ b/linux/drivers/media/radio/radio-aimslab.c
@@ -47,11 +47,7 @@
 
 static int io = CONFIG_RADIO_RTRACK_PORT;
 static int radio_nr = -1;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 static struct mutex lock;
-#else
-static struct semaphore lock;
-#endif
 
 struct rt_device
 {
diff --git a/linux/drivers/media/radio/radio-aztech.c b/linux/drivers/media/radio/radio-aztech.c
index 3e18a7687..1fbf32d15 100644
--- a/linux/drivers/media/radio/radio-aztech.c
+++ b/linux/drivers/media/radio/radio-aztech.c
@@ -66,11 +66,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 static int io = CONFIG_RADIO_AZTECH_PORT;
 static int radio_nr = -1;
 static int radio_wait_time = 1000;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 static struct mutex lock;
-#else
-static struct semaphore lock;
-#endif
 
 struct az_device
 {
diff --git a/linux/drivers/media/radio/radio-maxiradio.c b/linux/drivers/media/radio/radio-maxiradio.c
index 17fa03d5f..ae3fe626e 100644
--- a/linux/drivers/media/radio/radio-maxiradio.c
+++ b/linux/drivers/media/radio/radio-maxiradio.c
@@ -39,9 +39,7 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <linux/pci.h>
 #include <linux/videodev2.h>
@@ -121,11 +119,7 @@ static struct radio_device
 
 	unsigned long freq;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 } radio_unit = {
 	.muted =1,
 	.freq = FREQ_LO,
diff --git a/linux/drivers/media/radio/radio-sf16fmi.c b/linux/drivers/media/radio/radio-sf16fmi.c
index e559eae5a..adc140f7b 100644
--- a/linux/drivers/media/radio/radio-sf16fmi.c
+++ b/linux/drivers/media/radio/radio-sf16fmi.c
@@ -28,9 +28,7 @@
 #include <linux/isapnp.h>
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
 
@@ -56,11 +54,7 @@ struct fmi_device
 static int io = -1;
 static int radio_nr = -1;
 static struct pnp_dev *dev = NULL;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 static struct mutex lock;
-#else
-static struct semaphore lock;
-#endif
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only useful to give freq in intervall of 800 (=0.05Mhz),
diff --git a/linux/drivers/media/radio/radio-sf16fmr2.c b/linux/drivers/media/radio/radio-sf16fmr2.c
index 72f302009..2cb47a0c8 100644
--- a/linux/drivers/media/radio/radio-sf16fmr2.c
+++ b/linux/drivers/media/radio/radio-sf16fmr2.c
@@ -23,13 +23,9 @@
 #include "compat.h"
 #include <linux/videodev2.h>	/* kernel radio structs		*/
 #include <media/v4l2-common.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
 
 static struct mutex lock;
-#else
-static struct semaphore lock;
-#endif
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
diff --git a/linux/drivers/media/radio/radio-si470x.c b/linux/drivers/media/radio/radio-si470x.c
index b41eddd4f..55c1a9b7b 100644
--- a/linux/drivers/media/radio/radio-si470x.c
+++ b/linux/drivers/media/radio/radio-si470x.c
@@ -132,9 +132,7 @@
 #include <linux/version.h>
 #include "compat.h"
 #include <linux/videodev2.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
 #include <linux/mutex.h>
-#endif
 #include <media/v4l2-common.h>
 #include <media/rds.h>
 #include <asm/unaligned.h>
@@ -463,11 +461,7 @@ struct si470x_device {
 	struct delayed_work work;
 #endif
 	wait_queue_head_t read_queue;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
 	struct mutex lock;		/* buffer locking */
-#else
-	struct semaphore lock;		/* buffer locking */
-#endif
 	unsigned char *buffer;		/* size is always multiple of three */
 	unsigned int buf_size;
 	unsigned int rd_index;
diff --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c
index 5db38526e..9b69eaf5a 100644
--- a/linux/drivers/media/radio/radio-typhoon.c
+++ b/linux/drivers/media/radio/radio-typhoon.c
@@ -85,11 +85,7 @@ struct typhoon_device {
 	int muted;
 	unsigned long curfreq;
 	unsigned long mutefreq;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 };
 
 static void typhoon_setvol_generic(struct typhoon_device *dev, int vol);
diff --git a/linux/drivers/media/radio/radio-zoltrix.c b/linux/drivers/media/radio/radio-zoltrix.c
index 68f30a456..197379ae6 100644
--- a/linux/drivers/media/radio/radio-zoltrix.c
+++ b/linux/drivers/media/radio/radio-zoltrix.c
@@ -74,11 +74,7 @@ struct zol_device {
 	unsigned long curfreq;
 	int muted;
 	unsigned int stereo;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 };
 
 static int zol_setvol(struct zol_device *dev, int vol)