Merge branch 'topic/misc' into for-linus

git-mirror · Aug 11, 2010 · 6b4e901 · 6b4e901
2 parents 8a345a0 + dc386c4
commit 6b4e901
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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>