git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
[pandora-kernel.git]
/
sound
/
soc
/
soc-jack.c
diff --git
a/sound/soc/soc-jack.c
b/sound/soc/soc-jack.c
index
fcab80b
..
fc017c0
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",