diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-14 11:48:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-14 11:48:25 +0200 |
| commit | 34e51ce60a210094bd66cf0a75dd8512247618ca (patch) | |
| tree | 4c30cc4a0c1f7f8e758692f92492b226db4d6e2a /sound/soc/pxa | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 6e498d5eb6afb50659b4b7fc302d480ca0ceaa93 (diff) | |
| download | blackbird-op-linux-34e51ce60a210094bd66cf0a75dd8512247618ca.tar.gz blackbird-op-linux-34e51ce60a210094bd66cf0a75dd8512247618ca.zip | |
Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
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 @@ #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" |
