diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /sound/core/misc.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'sound/core/misc.c')
| -rw-r--r-- | sound/core/misc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/misc.c b/sound/core/misc.c index eb9fe2e1d291..465f0ce772cb 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c | |||
| @@ -20,6 +20,8 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/export.h> | ||
| 24 | #include <linux/moduleparam.h> | ||
| 23 | #include <linux/time.h> | 25 | #include <linux/time.h> |
| 24 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| 25 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |