3 files changed, 0 insertions, 32 deletions
diff --git a/linux/sound/oss/aci.c b/linux/sound/oss/aci.c
index a8021c8c0..4c407b77f 100644
--- a/linux/sound/oss/aci.c
+++ b/linux/sound/oss/aci.c
@@ -56,11 +56,7 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 #include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
-#endif
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -85,11 +81,7 @@ static int aci_micpreamp=3; /* microphone preamp-level that can't be    *
 			 * checked with ACI versions prior to 0xb0	*/
 
 static int mixer_device;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 static struct mutex aci_mutex;
-#else
-static struct semaphore aci_mutex;
-#endif
 
 #ifdef MODULE
 static int reset;
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c
index 92438ac2f..9aa5f866f 100644
--- a/linux/sound/oss/btaudio.c
+++ b/linux/sound/oss/btaudio.c
@@ -32,11 +32,7 @@
 #include <linux/soundcard.h>
 #include <linux/slab.h>
 #include <linux/kdev_t.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 #include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
-#endif
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -115,11 +111,7 @@ struct btaudio {
 
 	/* locking */
 	int            users;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 
 	/* risc instructions */
 	unsigned int   risc_size;
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 7e6f22041..c33300f22 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -37,10 +37,6 @@
 #include <sound/control.h>
 #include <sound/initval.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-/* From linux/pch_ids.h, appeared in 2.6.14 */
-#define PCI_DEVICE_ID_BROOKTREE_879     0x0879
-#endif
 #ifdef COMPAT_SND_CTL_BOOLEAN_MONO
 static int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_info *uinfo)
@@ -413,21 +409,13 @@ static int snd_bt87x_set_digital_hw(struct snd_bt87x *chip, struct snd_pcm_runti
 
 static int snd_bt87x_set_analog_hw(struct snd_bt87x *chip, struct snd_pcm_runtime *runtime)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 	static struct snd_ratnum analog_clock = {
-#else
-	static ratnum_t analog_clock = {
-#endif
 		.num = ANALOG_CLOCK,
 		.den_min = CLOCK_DIV_MIN,
 		.den_max = CLOCK_DIV_MAX,
 		.den_step = 1
 	};
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 	static struct snd_pcm_hw_constraint_ratnums constraint_rates = {
-#else
-	static snd_pcm_hw_constraint_ratnums_t constraint_rates = {
-#endif
 		.nrats = 1,
 		.rats = &analog_clock
 	};
@@ -754,11 +742,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
 {
 	struct snd_bt87x *chip;
 	int err;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 	static struct snd_device_ops ops = {
-#else
-	static snd_device_ops_t ops = {
-#endif
 		.dev_free = snd_bt87x_dev_free
 	};