diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 06:39:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 06:39:18 -0400 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /sound/arm/pxa2xx-pcm.c | |
| parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'sound/arm/pxa2xx-pcm.c')
| -rw-r--r-- | sound/arm/pxa2xx-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index 0ede9e4656a8..381094aab235 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c | |||
| @@ -21,8 +21,8 @@ | |||
| 21 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
| 22 | 22 | ||
| 23 | #include <asm/dma.h> | 23 | #include <asm/dma.h> |
| 24 | #include <asm/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <asm/arch/pxa-regs.h> | 25 | #include <mach/pxa-regs.h> |
| 26 | 26 | ||
| 27 | #include "pxa2xx-pcm.h" | 27 | #include "pxa2xx-pcm.h" |
| 28 | 28 | ||