diff options
| author | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /sound/soc/pxa/pxa2xx-i2s.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'sound/soc/pxa/pxa2xx-i2s.c')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 8f96d87f7b4b..8548818eea08 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | #include <sound/initval.h> | 21 | #include <sound/initval.h> |
| 22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
| 23 | 23 | ||
| 24 | #include <asm/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <asm/arch/pxa-regs.h> | 25 | #include <mach/pxa-regs.h> |
| 26 | #include <asm/arch/pxa2xx-gpio.h> | 26 | #include <mach/pxa2xx-gpio.h> |
| 27 | #include <asm/arch/audio.h> | 27 | #include <mach/audio.h> |
| 28 | 28 | ||
| 29 | #include "pxa2xx-pcm.h" | 29 | #include "pxa2xx-pcm.h" |
| 30 | #include "pxa2xx-i2s.h" | 30 | #include "pxa2xx-i2s.h" |