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/soc/pxa/pxa-ssp.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 74ff69e3ce34..286be31545df 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <sound/pxa2xx-lib.h> | 30 | #include <sound/pxa2xx-lib.h> |
| 31 | 31 | ||
| 32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 33 | #include <mach/pxa-regs.h> | 33 | #include <mach/dma.h> |
| 34 | #include <mach/regs-ssp.h> | 34 | #include <mach/regs-ssp.h> |
| 35 | #include <mach/audio.h> | 35 | #include <mach/audio.h> |
| 36 | #include <mach/ssp.h> | 36 | #include <mach/ssp.h> |