diff --git a/[refs] b/[refs] index 66dad941350c..e91b4f8c93e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83048ea7b1d11f5e560dea53873fb51d860202eb +refs/heads/master: f664417e23192087bb9bdafdff80e04104994cc0 diff --git a/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index fb7a32e730af..b1e099a3369c 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/sound/pci/hda/patch_ca0132.c @@ -2615,6 +2615,7 @@ static int dspload_image(struct hda_codec *codec, return status; } +#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP static bool dspload_is_loaded(struct hda_codec *codec) { unsigned int data = 0; @@ -2626,6 +2627,9 @@ static bool dspload_is_loaded(struct hda_codec *codec) return true; } +#else +#define dspload_is_loaded(codec) false +#endif static bool dspload_wait_loaded(struct hda_codec *codec) {