Merge branch 'topic/misc' into for-linus

2010-08-11 08:43:09 +02:00 · 2010-08-11 08:43:09 +02:00 · 6b4e901296
commit 6b4e901296
parent 8a345a042a dc386c4f6f
2 changed files with 1 additions and 2 deletions
--- 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;
 			} 
--- 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>