diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 16:30:58 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 16:30:58 -0700 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /sound/isa/msnd | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
| download | kernel_samsung_smdk4412-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip kernel_samsung_smdk4412-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.gz kernel_samsung_smdk4412-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.bz2 | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/isa/msnd')
| -rw-r--r-- | sound/isa/msnd/msnd_midi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c index 4be562b..7874956 100644 --- a/sound/isa/msnd/msnd_midi.c +++ b/sound/isa/msnd/msnd_midi.c @@ -25,6 +25,7 @@ */ #include <linux/io.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/ioport.h> #include <linux/errno.h> |