diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 18:00:16 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 18:00:16 +0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/soc/pxa/spitz.c | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
download | linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.tar.xz |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
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 @@ #include <sound/soc-dapm.h> #include <asm/mach-types.h> -#include <mach/pxa-regs.h> -#include <mach/hardware.h> #include <mach/spitz.h> #include "../codecs/wm8750.h" #include "pxa2xx-pcm.h" |