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/devel' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-vpr200.c
diff --git
a/arch/arm/mach-imx/mach-vpr200.c
b/arch/arm/mach-imx/mach-vpr200.c
index
7d8e012
..
6909245
100644
(file)
--- a/
arch/arm/mach-imx/mach-vpr200.c
+++ b/
arch/arm/mach-imx/mach-vpr200.c
@@
-162,7
+162,7
@@
static struct i2c_board_info vpr200_i2c_devices[] = {
}, {
I2C_BOARD_INFO("mc13892", 0x08),
.platform_data = &vpr200_pmic,
}, {
I2C_BOARD_INFO("mc13892", 0x08),
.platform_data = &vpr200_pmic,
- .irq =
gpio_to_irq
(GPIO_PMIC_INT),
+ .irq =
IMX_GPIO_TO_IRQ
(GPIO_PMIC_INT),
}
};
}
};
@@
-319,6
+319,7
@@
MACHINE_START(VPR200, "VPR200")
.map_io = mx35_map_io,
.init_early = imx35_init_early,
.init_irq = mx35_init_irq,
.map_io = mx35_map_io,
.init_early = imx35_init_early,
.init_irq = mx35_init_irq,
+ .handle_irq = imx35_handle_irq,
.timer = &vpr200_timer,
.init_machine = vpr200_board_init,
MACHINE_END
.timer = &vpr200_timer,
.init_machine = vpr200_board_init,
MACHINE_END