diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /sound/soc/pxa/pxa-ssp.c | |
| parent | Merge branch 'for-2.6.30' into for-2.6.31 (diff) | |
| parent | Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.xz linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
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 176af7ff234b..6768e4ecfd75 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -30,7 +30,7 @@ #include <sound/pxa2xx-lib.h> #include <mach/hardware.h> -#include <mach/pxa-regs.h> +#include <mach/dma.h> #include <mach/regs-ssp.h> #include <mach/audio.h> #include <mach/ssp.h> |