Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 0 insertions, 9 deletions

diff --git a/sound/soc/codecs/ssm2602.h b/sound/soc/codecs/ssm2602.h
index f344e6d76e31..b98c69168036 100644
--- a/sound/soc/codecs/ssm2602.h
+++ b/sound/soc/codecs/ssm2602.h
@@ -117,14 +117,5 @@
 #define SSM2602_CACHEREGNUM     10
 
 #define SSM2602_SYSCLK  0
-#define SSM2602_DAI             0
-
-struct ssm2602_setup_data {
-        int i2c_bus;
-        unsigned short i2c_address;
-};
-
-extern struct snd_soc_dai ssm2602_dai;
-extern struct snd_soc_codec_device soc_codec_dev_ssm2602;
 
 #endif