lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/misc' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2010-08-11 08:43:09 +02:00
parent 8a345a042a dc386c4f6f
commit 6b4e901296
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/oss/ad1848.c
View File

@@ -716,7 +716,7 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
default: default:
if (get_user(val, (int __user *)arg)) if (get_user(val, (int __user *)arg))
return -EFAULT; return -EFAULT;
val = ad1848_mixer_set(devc, cmd & 0xff, val); val = ad1848_mixer_set(devc, cmd & 0xff, val);
break; break;
} }

1
sound/oss/au1550_ac97.c
View File

@@ -50,7 +50,6 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/ac97_codec.h> #include <linux/ac97_codec.h>
#include <linux/mutex.h> #include <linux/mutex.h>