summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel/atmel_ssc_dai.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 14:40:28 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 14:40:28 +0100
commitcf7af01aa77ec1b17687f5328ce0a598709efd59 (patch)
tree4cc46339721366c7498dacf5ebac01906be273e7 /sound/soc/atmel/atmel_ssc_dai.h
parent6f341d14811550d863ba804ce6ec7757a7145081 (diff)
parent5dcba5d6741d4533e0ef696507f93f2a4c738efb (diff)
downloadtalos-obmc-linux-cf7af01aa77ec1b17687f5328ce0a598709efd59.tar.gz
talos-obmc-linux-cf7af01aa77ec1b17687f5328ce0a598709efd59.zip
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/atmel/atmel_ssc_dai.h')
-rw-r--r--sound/soc/atmel/atmel_ssc_dai.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h
index 391135f9c6c1..392a46953112 100644
--- a/sound/soc/atmel/atmel_ssc_dai.h
+++ b/sound/soc/atmel/atmel_ssc_dai.h
@@ -116,6 +116,5 @@ struct atmel_ssc_info {
struct atmel_pcm_dma_params *dma_params[2];
struct atmel_ssc_state ssc_state;
};
-extern struct snd_soc_dai atmel_ssc_dai[];
#endif /* _AT91_SSC_DAI_H */
OpenPOWER on IntegriCloud