summaryrefslogtreecommitdiff
path: root/linux/sound/oss
diff options
context:
space:
mode:
Diffstat (limited to 'linux/sound/oss')
-rw-r--r--linux/sound/oss/aci.c8
-rw-r--r--linux/sound/oss/btaudio.c8
2 files changed, 0 insertions, 16 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;