diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:28:43 -0500 |
| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
| tree | d2cebc7039954851998d592123899f5627def7a9 /sound/core/info.c | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'sound/core/info.c')
| -rw-r--r-- | sound/core/info.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index b70564ed8b3..7077f601da5 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | #include <linux/smp_lock.h> | ||
| 27 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 29 | #include <sound/minors.h> | 28 | #include <sound/minors.h> |