diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/arm/pxa2xx-pcm-lib.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/arm/pxa2xx-pcm-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 75a0d746fb60..108b643229ba 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c | |||
| @@ -12,8 +12,7 @@ | |||
| 12 | #include <sound/pcm_params.h> | 12 | #include <sound/pcm_params.h> |
| 13 | #include <sound/pxa2xx-lib.h> | 13 | #include <sound/pxa2xx-lib.h> |
| 14 | 14 | ||
| 15 | #include <asm/dma.h> | 15 | #include <mach/dma.h> |
| 16 | #include <mach/pxa-regs.h> | ||
| 17 | 16 | ||
| 18 | #include "pxa2xx-pcm.h" | 17 | #include "pxa2xx-pcm.h" |
| 19 | 18 | ||