diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-09 17:41:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-09 17:41:44 +0200 |
| commit | 7b03d1d9c0fd5d6df8da75d595c0768224d2a146 (patch) | |
| tree | 7e9e8c08f6ff4adfe90be7c82f6fe9aa4832fc8a /sound | |
| parent | 5f1890897cd184cc9a0000476279fd01d572ff4b (diff) | |
| parent | 97c6a3d17b978092d0df94d5d68dbfc7c74f0902 (diff) | |
| download | linux-7b03d1d9c0fd5d6df8da75d595c0768224d2a146.tar.bz2 | |
Merge branch 'topic/hda-probe-defer' into for-next
Fix a build error when CONFIG_SND_HDA_PATCH_LOADER isn't set.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3de3a5cbf1dc..23ad7e216a6b 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -3159,6 +3159,7 @@ static void power_down_all_codecs(struct azx *chip) #endif } +#ifdef CONFIG_SND_HDA_PATCH_LOADER /* callback from request_firmware_nowait() */ static void azx_firmware_cb(const struct firmware *fw, void *context) { @@ -3183,6 +3184,7 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) snd_card_free(card); pci_set_drvdata(pci, NULL); } +#endif static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) |