Merge remote-tracking branch 'asoc/topic/core' into tmp

1 files changed, 0 insertions, 4 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 8e2ad52078b6..71848058ffd4 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -697,7 +697,6 @@ struct snd_soc_codec {
         unsigned int probed:1; /* Codec has been probed */
         unsigned int ac97_registered:1; /* Codec has been AC97 registered */
         unsigned int ac97_created:1; /* Codec has been created by SoC */
-        unsigned int sysfs_registered:1; /* codec has been sysfs registered */
         unsigned int cache_init:1; /* codec cache has been initialized */
         unsigned int using_regmap:1; /* using regmap access */
         u32 cache_only;  /* Suppress writes to hardware */
@@ -705,7 +704,6 @@ struct snd_soc_codec {
 
         /* codec IO */
         void *control_data; /* codec control (i2c/3wire) data */
-        enum snd_soc_control_type control_type;
         hw_write_t hw_write;
         unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
         unsigned int (*read)(struct snd_soc_codec *, unsigned int);
@@ -724,7 +722,6 @@ struct snd_soc_codec {
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_codec_root;
         struct dentry *debugfs_reg;
-        struct dentry *debugfs_dapm;
 #endif
 };
 
@@ -849,7 +846,6 @@ struct snd_soc_platform {
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_platform_root;
-        struct dentry *debugfs_dapm;
 #endif
 };