9 files changed, 47 insertions, 3 deletions
diff --git a/linux/drivers/media/radio/miropcm20-rds-core.c b/linux/drivers/media/radio/miropcm20-rds-core.c
index dfb8252b2..3f5aaf5fa 100644
--- a/linux/drivers/media/radio/miropcm20-rds-core.c
+++ b/linux/drivers/media/radio/miropcm20-rds-core.c
@@ -18,7 +18,10 @@
 #include <linux/string.h>
 #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 "../../../sound/oss/aci.h"
@@ -26,7 +29,11 @@
 
 #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 8e966733b..c167f19c0 100644
--- a/linux/drivers/media/radio/radio-aimslab.c
+++ b/linux/drivers/media/radio/radio-aimslab.c
@@ -44,7 +44,11 @@
 
 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 3aa679a47..4a06891d8 100644
--- a/linux/drivers/media/radio/radio-aztech.c
+++ b/linux/drivers/media/radio/radio-aztech.c
@@ -43,7 +43,11 @@
 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-maestro.c b/linux/drivers/media/radio/radio-maestro.c
index d93357579..dfa1e6ded 100644
--- a/linux/drivers/media/radio/radio-maestro.c
+++ b/linux/drivers/media/radio/radio-maestro.c
@@ -23,10 +23,12 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <linux/mutex.h>
 #include <linux/pci.h>
 #include "compat.h"
 #include <linux/videodev.h>
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+#include <linux/mutex.h>
+#endif
 
 
 #define DRIVER_VERSION	"0.05"
@@ -106,7 +108,11 @@ struct radio_device {
 		muted,	/* VIDEO_AUDIO_MUTE */
 		stereo,	/* VIDEO_TUNER_STEREO_ON */
 		tuned;	/* signal strength (0 or 0xffff) */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
+#else
+	struct semaphore lock;
+#endif
 };
 
 static u32 radio_bits_get(struct radio_device *dev)
diff --git a/linux/drivers/media/radio/radio-maxiradio.c b/linux/drivers/media/radio/radio-maxiradio.c
index 2b83fa519..d9bfe3f32 100644
--- a/linux/drivers/media/radio/radio-maxiradio.c
+++ b/linux/drivers/media/radio/radio-maxiradio.c
@@ -37,10 +37,12 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include "compat.h"
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
+#endif
 
 #include <linux/pci.h>
-#include "compat.h"
 #include <linux/videodev.h>
 
 /* version 0.75      Sun Feb  4 22:51:27 EET 2001 */
@@ -103,7 +105,11 @@ 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 = {0, 0, 0, 0, };
 
 
diff --git a/linux/drivers/media/radio/radio-sf16fmi.c b/linux/drivers/media/radio/radio-sf16fmi.c
index 90ecea017..62bb19d2c 100644
--- a/linux/drivers/media/radio/radio-sf16fmi.c
+++ b/linux/drivers/media/radio/radio-sf16fmi.c
@@ -25,8 +25,14 @@
 #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>
 
+static struct mutex lock;
+#else
+static struct semaphore lock;
+#endif
+
 struct fmi_device
 {
 	int port;
@@ -38,7 +44,6 @@ struct fmi_device
 static int io = -1;
 static int radio_nr = -1;
 static struct pnp_dev *dev = NULL;
-static struct mutex lock;
 
 /* 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 f4d80c0e4..0bafd3267 100644
--- a/linux/drivers/media/radio/radio-sf16fmr2.c
+++ b/linux/drivers/media/radio/radio-sf16fmr2.c
@@ -20,9 +20,13 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include "compat.h"
 #include <linux/videodev.h>	/* kernel radio structs		*/
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
 
 static struct mutex lock;
+#else
+static struct semaphore lock;
+#endif
 
 #undef DEBUG
 //#define DEBUG 1
diff --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c
index 541072e7c..02cc2c093 100644
--- a/linux/drivers/media/radio/radio-typhoon.c
+++ b/linux/drivers/media/radio/radio-typhoon.c
@@ -60,7 +60,11 @@ 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 d428514c7..e8363cf6b 100644
--- a/linux/drivers/media/radio/radio-zoltrix.c
+++ b/linux/drivers/media/radio/radio-zoltrix.c
@@ -49,7 +49,11 @@ 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)