Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index d31e8b7b2d5e453969adff8151b796b6b60879cb..5c3bce83f28ad1be248a35c89d190dcb1504c36e 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -214,10 +214,10 @@
  * @OFF:     Power Off. No restrictions on transition times.
  */
 enum snd_soc_bias_level {
-       SND_SOC_BIAS_ON,
-       SND_SOC_BIAS_PREPARE,
-       SND_SOC_BIAS_STANDBY,
        SND_SOC_BIAS_OFF,
+       SND_SOC_BIAS_STANDBY,
+       SND_SOC_BIAS_PREPARE,
+       SND_SOC_BIAS_ON,
 };
 
 struct snd_jack;
@@ -385,7 +385,7 @@ struct snd_soc_jack_gpio {
        int invert;
        int debounce_time;
        struct snd_soc_jack *jack;
-       struct work_struct work;
+       struct delayed_work work;
 
        int (*jack_status_check)(void);
 };
@@ -442,6 +442,7 @@ struct snd_soc_codec {
        unsigned int suspended:1; /* Codec is in suspend PM state */
        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 */
 
        /* codec IO */