Merge branch 'topic/misc' into for-linus

6b4e9012 · Takashi Iwai · 8a345a04 · dc386c4f · 6b4e9012 · 6b4e9012
Commit 6b4e9012 authored Aug 11, 2010 by Takashi Iwai
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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

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

No files found.
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
--- 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>