Merge branch 'master' into csb1725

[mv-sheeva.git] / sound / soc / jz4740 / jz4740-i2s.h

diff --git a/sound/soc/jz4740/jz4740-i2s.h b/sound/soc/jz4740/jz4740-i2s.h
index da22ed88a5899ae334670e58ae88767f25287bda..5e49339d8b9340212e7e74f0defc3d2c5cc2ce76 100644 (file)
--- a/sound/soc/jz4740/jz4740-i2s.h
+++ b/sound/soc/jz4740/jz4740-i2s.h
@@ -13,6 +13,4 @@
 
 #define JZ4740_I2S_BIT_CLK             0
 
-extern struct snd_soc_dai jz4740_i2s_dai;
-
 #endif