ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[karo-tx-linux.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 6203a72d57af1dafbd866ad7671a830ce869cf50..7c17b98d584609c4a9fd78afe5c019a43728db1f 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -331,7 +331,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                        goto err;
 
                if (gpios[i].wake) {
-                       ret = set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
+                       ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
                        if (ret != 0)
                                printk(KERN_ERR
                                  "Failed to mark GPIO %d as wake source: %d\n",