diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /sound/soc/pxa/spitz.c | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/pxa/spitz.c')
| -rw-r--r-- | sound/soc/pxa/spitz.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 6ca9f53080c6..c4cd2acaacb4 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | #include <sound/soc-dapm.h> | 26 | #include <sound/soc-dapm.h> |
| 27 | 27 | ||
| 28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 29 | #include <mach/pxa-regs.h> | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | #include <mach/spitz.h> | 29 | #include <mach/spitz.h> |
| 32 | #include "../codecs/wm8750.h" | 30 | #include "../codecs/wm8750.h" |
| 33 | #include "pxa2xx-pcm.h" | 31 | #include "pxa2xx-pcm.h" |