projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
sound
/
oss
/
au1550_ac97.c
diff --git
a/sound/oss/au1550_ac97.c
b/sound/oss/au1550_ac97.c
index
c4a4cdc
..
c6f2621
100644
(file)
--- 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>