Merge branch 'topic/snd_card_new-err' into topic/atmel

[linux-2.6-omap-h63xx.git] / sound / pci / hda / hda_hwdep.c

diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 653da1d3e4dfb6018f489d90ec1226e5988fecfb..300ab407cf42ede5b34eeace7ed9286836b5f118 100644 (file)
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -116,7 +116,7 @@ static void hwdep_free(struct snd_hwdep *hwdep)
        clear_hwdep_elements(hwdep->private_data);
 }
 
-int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
+int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
 {
        char hwname[16];
        struct snd_hwdep *hwdep;
@@ -145,6 +145,8 @@ int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
        return 0;
 }
 
+#ifdef CONFIG_SND_HDA_RECONFIG
+
 /*
  * sysfs interface
  */
@@ -166,7 +168,7 @@ static int reconfig_codec(struct hda_codec *codec)
        if (err < 0)
                return err;
        /* rebuild PCMs */
-       err = snd_hda_build_pcms(codec->bus);
+       err = snd_hda_codec_build_pcms(codec);
        if (err < 0)
                return err;
        /* rebuild mixers */
@@ -347,3 +349,5 @@ int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
                                          hwdep->device, &codec_attrs[i]);
        return 0;
 }
+
+#endif /* CONFIG_SND_HDA_RECONFIG */