Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 61433d492862..d653104b59cb 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -257,9 +257,11 @@ static int __devinit platform_pmic_gpio_probe(struct platform_device *pdev)
         }
 
         for (i = 0; i < 8; i++) {
-                set_irq_chip_and_handler_name(i + pg->irq_base, &pmic_irqchip,
-                                        handle_simple_irq, "demux");
-                set_irq_chip_data(i + pg->irq_base, pg);
+                irq_set_chip_and_handler_name(i + pg->irq_base,
+                                              &pmic_irqchip,
+                                              handle_simple_irq,
+                                              "demux");
+                irq_set_chip_data(i + pg->irq_base, pg);
         }
         return 0;
 err: