Merge branch 'topic/hda' into for-next

[linux-2.6-block.git] / sound / pci / hda / hda_intel.c

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 5aa5cfa517aa383b56936355473a1b12ea72f3c0..87df90d245bc7f9725329e5552d79749dca51284 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip)
                if (pci->device != 0x0f04 && pci->device != 0x2284)
                        hda->need_i915_power = 1;
 
-
-#ifdef CONFIG_SND_HDA_I915
                err = hda_i915_init(hda);
                if (err < 0)
                        goto i915_power_fail;
@@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip)
                                "Cannot turn on display power on i915\n");
                        goto i915_power_fail;
                }
-#endif
        }
 
        err = azx_first_init(chip);