diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-11 08:43:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-11 08:43:09 +0200 |
| commit | 6b4e9012961cb9be82bae4258f34e33da32340a4 (patch) | |
| tree | 6c312538a260da23f3e7d4b11845036b9c52f793 /sound | |
| parent | 8a345a042ae75097fd493633633382644257cfc3 (diff) | |
| parent | dc386c4f6f3e6f495d1c6f72602c065153814385 (diff) | |
| download | linux-6b4e9012961cb9be82bae4258f34e33da32340a4.tar.gz linux-6b4e9012961cb9be82bae4258f34e33da32340a4.tar.bz2 linux-6b4e9012961cb9be82bae4258f34e33da32340a4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/ad1848.c | 2 | ||||
| -rw-r--r-- | sound/oss/au1550_ac97.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 24793c5b65ac..4d2a6ae978f7 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 c4a4cdc07ab9..c6f2621221ba 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> |