Merge branch 'topic/misc' into for-linus

6b4e9012 · Takashi Iwai · 8a345a04 · dc386c4f · 6b4e9012 · 6b4e9012
隐藏空白更改
内联并排

Showing with 1 addition and 2 deletion

sound/oss/ad1848.c sound/oss/ad1848.c +1 -1

sound/oss/au1550_ac97.c sound/oss/au1550_ac97.c +0 -1

未找到文件。
--- 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>