diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-11 02:43:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-11 02:43:09 -0400 |
| commit | 6b4e9012961cb9be82bae4258f34e33da32340a4 (patch) | |
| tree | 6c312538a260da23f3e7d4b11845036b9c52f793 /sound/oss/au1550_ac97.c | |
| parent | 8a345a042ae75097fd493633633382644257cfc3 (diff) | |
| parent | dc386c4f6f3e6f495d1c6f72602c065153814385 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/au1550_ac97.c')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index c4a4cdc07ab9..c6f2621221ba 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <linux/poll.h> | 50 | #include <linux/poll.h> |
| 51 | #include <linux/bitops.h> | 51 | #include <linux/bitops.h> |
| 52 | #include <linux/spinlock.h> | 52 | #include <linux/spinlock.h> |
| 53 | #include <linux/smp_lock.h> | ||
| 54 | #include <linux/ac97_codec.h> | 53 | #include <linux/ac97_codec.h> |
| 55 | #include <linux/mutex.h> | 54 | #include <linux/mutex.h> |
| 56 | 55 | ||