diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-12 14:40:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-12 14:40:28 +0100 |
| commit | cf7af01aa77ec1b17687f5328ce0a598709efd59 (patch) | |
| tree | 4cc46339721366c7498dacf5ebac01906be273e7 /sound/soc/omap/omap-mcbsp.h | |
| parent | 6f341d14811550d863ba804ce6ec7757a7145081 (diff) | |
| parent | 5dcba5d6741d4533e0ef696507f93f2a4c738efb (diff) | |
Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.h')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index 6c363e5f4387..ffdcc5abb7b9 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -55,8 +55,6 @@ enum omap_mcbsp_div { #define NUM_LINKS 5 #endif -extern struct snd_soc_dai omap_mcbsp_dai[NUM_LINKS]; - int omap_mcbsp_st_add_controls(struct snd_soc_codec *codec, int mcbsp_id); #endif |