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/pxa/pxa2xx-i2s.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/pxa/pxa2xx-i2s.h')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.h b/sound/soc/pxa/pxa2xx-i2s.h index e2def441153..070f3c6059f 100644 --- a/sound/soc/pxa/pxa2xx-i2s.h +++ b/sound/soc/pxa/pxa2xx-i2s.h @@ -15,6 +15,4 @@ /* I2S clock */ #define PXA2XX_I2S_SYSCLK 0 -extern struct snd_soc_dai pxa_i2s_dai; - #endif |