summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-13 15:12:48 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-13 15:12:48 +0100
commit9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (patch)
treeb2fd16631dff8129efe01a00a0d7d60ea7d60eb0 /sound/soc/pxa
parentf2644a2c00a06236a9c5e85488b0680825bad39c (diff)
parent6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 (diff)
downloadop-kernel-dev-9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038.zip
op-kernel-dev-9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038.tar.gz
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/magician.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index f7c4544..0625c34 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -27,8 +27,6 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
#include <mach/magician.h>
#include <asm/mach-types.h>
#include "../codecs/uda1380.h"
OpenPOWER on IntegriCloud