diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index ca699a3017f3..7ee2f70ca42e 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -221,8 +221,6 @@ int snd_soc_dapm_new_controls(struct snd_soc_codec *codec, | |||
221 | int num); | 221 | int num); |
222 | 222 | ||
223 | /* dapm path setup */ | 223 | /* dapm path setup */ |
224 | int __deprecated snd_soc_dapm_connect_input(struct snd_soc_codec *codec, | ||
225 | const char *sink_name, const char *control_name, const char *src_name); | ||
226 | int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec); | 224 | int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec); |
227 | void snd_soc_dapm_free(struct snd_soc_device *socdev); | 225 | void snd_soc_dapm_free(struct snd_soc_device *socdev); |
228 | int snd_soc_dapm_add_routes(struct snd_soc_codec *codec, | 226 | int snd_soc_dapm_add_routes(struct snd_soc_codec *codec, |
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5e0189876afd..da0040b69c2d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -426,6 +426,7 @@ struct snd_soc_codec { | |||
426 | short reg_cache_step; | 426 | short reg_cache_step; |
427 | 427 | ||
428 | /* dapm */ | 428 | /* dapm */ |
429 | u32 pop_time; | ||
429 | struct list_head dapm_widgets; | 430 | struct list_head dapm_widgets; |
430 | struct list_head dapm_paths; | 431 | struct list_head dapm_paths; |
431 | enum snd_soc_bias_level bias_level; | 432 | enum snd_soc_bias_level bias_level; |
@@ -517,6 +518,9 @@ struct snd_soc_device { | |||
517 | struct delayed_work delayed_work; | 518 | struct delayed_work delayed_work; |
518 | struct work_struct deferred_resume_work; | 519 | struct work_struct deferred_resume_work; |
519 | void *codec_data; | 520 | void *codec_data; |
521 | #ifdef CONFIG_DEBUG_FS | ||
522 | struct dentry *debugfs_root; | ||
523 | #endif | ||
520 | }; | 524 | }; |
521 | 525 | ||
522 | /* runtime channel data */ | 526 | /* runtime channel data */ |