diff options
| author | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-11-28 16:27:07 -0500 |
| commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
| tree | afb229254bed6415407b7b7d4641f9f792109966 /sound/core/info.c | |
| parent | 074e61ec3751da9ab88ee66d3818574556c03489 (diff) | |
| parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) | |
Merge branch 'master' into next
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 b70564ed8b37..7077f601da5a 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> |