diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:57:31 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:57:31 +0400 |
| commit | 526b264163068f77c5f2409031f5e25caf3900a9 (patch) | |
| tree | 196e7581f1546e48ba392ff099f369e5c622636b /arch/arm/mach-imx/mach-vpr200.c | |
| parent | 4c4cbce68f57555cddb9d77da333bf50875148ce (diff) | |
| parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff) | |
| download | linux-526b264163068f77c5f2409031f5e25caf3900a9.tar.xz | |
Merge branch 'imx/cleanup' into imx/devel
This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-vpr200.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-vpr200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c index 4f310b38924d..69092458f2d9 100644 --- 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), } }; |