diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /sound/soc/au1x/db1200.c | |
parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/au1x/db1200.c')
-rw-r--r-- | sound/soc/au1x/db1200.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index b62fcd33e586..cb99f04abe88 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <sound/core.h> | 13 | #include <sound/core.h> |
14 | #include <sound/pcm.h> | 14 | #include <sound/pcm.h> |
15 | #include <sound/soc.h> | 15 | #include <sound/soc.h> |
16 | #include <sound/soc-dapm.h> | ||
17 | #include <asm/mach-au1x00/au1000.h> | 16 | #include <asm/mach-au1x00/au1000.h> |
18 | #include <asm/mach-au1x00/au1xxx_psc.h> | 17 | #include <asm/mach-au1x00/au1xxx_psc.h> |
19 | #include <asm/mach-au1x00/au1xxx_dbdma.h> | 18 | #include <asm/mach-au1x00/au1xxx_dbdma.h> |