diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /sound/soc/pxa/em-x270.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
| download | linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.tar.gz linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.tar.bz2 linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index fe4a729ea648..949be9c2a01b 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -29,8 +29,6 @@ #include <sound/soc-dapm.h> #include <asm/mach-types.h> -#include <mach/pxa-regs.h> -#include <mach/hardware.h> #include <mach/audio.h> #include "../codecs/wm9712.h" |