diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-13 10:12:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-13 10:12:48 -0400 |
| commit | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (patch) | |
| tree | b2fd16631dff8129efe01a00a0d7d60ea7d60eb0 /sound/soc/pxa | |
| parent | f2644a2c00a06236a9c5e85488b0680825bad39c (diff) | |
| parent | 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/magician.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index f7c4544f7859..0625c342a1c9 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
| 28 | #include <sound/soc-dapm.h> | 28 | #include <sound/soc-dapm.h> |
| 29 | 29 | ||
| 30 | #include <mach/pxa-regs.h> | ||
| 31 | #include <mach/hardware.h> | ||
| 32 | #include <mach/magician.h> | 30 | #include <mach/magician.h> |
| 33 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
| 34 | #include "../codecs/uda1380.h" | 32 | #include "../codecs/uda1380.h" |