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 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...
[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
..
5250283
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,
- .irq =
gpio_to_irq
(GPIO_PMIC_INT),
+ .irq =
IMX_GPIO_TO_IRQ
(GPIO_PMIC_INT),
}
};