Merge remote-tracking branch 'asoc/topic/rt5665' into asoc-next

[sfrench/cifs-2.6.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5bbb3a6767c344658962f14efe2f284877228beb..5170fd81e1fd0886c465225b72748c44792240d5 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -499,7 +499,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
 int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
        unsigned int dai_fmt);
 
+#ifdef CONFIG_DMI
 int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+#else
+static inline int snd_soc_set_dmi_name(struct snd_soc_card *card,
+                                      const char *flavour)
+{
+       return 0;
+}
+#endif
 
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
@@ -815,7 +823,6 @@ struct snd_soc_component {
 
        unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
        unsigned int registered_as_component:1;
-       unsigned int auxiliary:1; /* for auxiliary component of the card */
        unsigned int suspended:1; /* is in suspend PM state */
 
        struct list_head list;