aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-11 08:43:09 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-11 08:43:09 +0200
commit6b4e9012961cb9be82bae4258f34e33da32340a4 (patch)
tree6c312538a260da23f3e7d4b11845036b9c52f793 /sound
parent8a345a042ae75097fd493633633382644257cfc3 (diff)
parentdc386c4f6f3e6f495d1c6f72602c065153814385 (diff)
downloadlinux-linaro-android-6b4e9012961cb9be82bae4258f34e33da32340a4.tar.gz
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/ad1848.c2
-rw-r--r--sound/oss/au1550_ac97.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 24793c5b65a..4d2a6ae978f 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -716,7 +716,7 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
default:
if (get_user(val, (int __user *)arg))
- return -EFAULT;
+ return -EFAULT;
val = ad1848_mixer_set(devc, cmd & 0xff, val);
break;
}
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index c4a4cdc07ab..c6f2621221b 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -50,7 +50,6 @@
#include <linux/poll.h>
#include <linux/bitops.h>
#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
#include <linux/ac97_codec.h>
#include <linux/mutex.h>