diff options
| author | Takashi Iwai | 2010-10-25 10:00:30 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2010-10-25 10:00:30 +0200 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /sound/soc/davinci/davinci-i2s.h | |
| parent | Merge branch 'topic/misc' into for-linus (diff) | |
| parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
| download | kernel-qcow2-linux-aa5c14d5c0d3e4c587db4a1b220b9c86415c538f.tar.gz kernel-qcow2-linux-aa5c14d5c0d3e4c587db4a1b220b9c86415c538f.tar.xz kernel-qcow2-linux-aa5c14d5c0d3e4c587db4a1b220b9c86415c538f.zip | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.h')
| -rw-r--r-- | sound/soc/davinci/davinci-i2s.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/davinci/davinci-i2s.h index 0b1e77b8c279..48dac3e2521a 100644 --- a/sound/soc/davinci/davinci-i2s.h +++ b/sound/soc/davinci/davinci-i2s.h @@ -17,6 +17,4 @@ enum davinci_mcbsp_div { DAVINCI_MCBSP_CLKGDV, /* Sample rate generator divider */ }; -extern struct snd_soc_dai davinci_i2s_dai; - #endif |