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 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa25x.c
diff --git
a/arch/arm/mach-pxa/pxa25x.c
b/arch/arm/mach-pxa/pxa25x.c
index
6bde595
..
a4af8c5
100644
(file)
--- a/
arch/arm/mach-pxa/pxa25x.c
+++ b/
arch/arm/mach-pxa/pxa25x.c
@@
-285,7
+285,7
@@
static inline void pxa25x_init_pm(void) {}
static int pxa25x_set_wake(struct irq_data *d, unsigned int on)
{
static int pxa25x_set_wake(struct irq_data *d, unsigned int on)
{
- int gpio =
IRQ_TO_GPIO
(d->irq);
+ int gpio =
irq_to_gpio
(d->irq);
uint32_t mask = 0;
if (gpio >= 0 && gpio < 85)
uint32_t mask = 0;
if (gpio >= 0 && gpio < 85)