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/blackfin/bf5xx-ad1836.c | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ad1836.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad1836.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index 2394bff2b655..83012da9dfc2 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <sound/core.h> | 20 | #include <sound/core.h> |
| 21 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
| 22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
| 23 | #include <sound/soc-dapm.h> | ||
| 24 | #include <sound/pcm_params.h> | 23 | #include <sound/pcm_params.h> |
| 25 | 24 | ||
| 26 | #include <asm/blackfin.h> | 25 | #include <asm/blackfin.h> |