diff --git a/[refs] b/[refs] index aa9971bbf7e9..ba3e97245bb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9b0951b96e4ee0d22fae0a30f0b53354ca541cd +refs/heads/master: 6874a918de503997164e76c540eaf44776fd5296 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index 66fd9bc9789d..098998743969 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -289,8 +289,8 @@ enum snd_soc_pcm_subclass { }; enum snd_soc_card_subclass { - SND_SOC_CARD_CLASS_INIT = 0, - SND_SOC_CARD_CLASS_PCM = 1, + SND_SOC_CARD_CLASS_INIT = 0, + SND_SOC_CARD_CLASS_RUNTIME = 1, }; int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,