diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 09:20:06 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 09:20:06 -0400 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /sound/mips/hal2.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/mips/hal2.c')
| -rw-r--r-- | sound/mips/hal2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 9a88cdfd952a..453d343550a8 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <asm/sgi/hpc3.h> | 30 | #include <asm/sgi/hpc3.h> |
| 30 | #include <asm/sgi/ip22.h> | 31 | #include <asm/sgi/ip22.h> |