diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 06:07:15 -0400 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /sound/ppc/snd_ps3.c | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'sound/ppc/snd_ps3.c')
| -rw-r--r-- | sound/ppc/snd_ps3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 53c81a547613..2f12da4da561 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c | |||
| @@ -20,10 +20,10 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | #include <linux/dmapool.h> | 22 | #include <linux/dmapool.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | 27 | ||
| 28 | #include <sound/asound.h> | 28 | #include <sound/asound.h> |
| 29 | #include <sound/control.h> | 29 | #include <sound/control.h> |