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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x300.c
diff --git
a/arch/arm/mach-pxa/cm-x300.c
b/arch/arm/mach-pxa/cm-x300.c
index
7a8edba
..
b2248e7
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x300.c
+++ b/
arch/arm/mach-pxa/cm-x300.c
@@
-765,7
+765,7
@@
static void __init cm_x300_init_da9030(void)
{
pxa3xx_set_i2c_power_info(&cm_x300_pwr_i2c_info);
i2c_register_board_info(1, &cm_x300_pmic_info, 1);
- set_irq_wake(IRQ_WAKEUP0, 1);
+
irq_
set_irq_wake(IRQ_WAKEUP0, 1);
}
static void __init cm_x300_init_wi2wi(void)