diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/mach-pxa/saar.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/mach-pxa/saar.c')
| -rw-r--r-- | arch/arm/mach-pxa/saar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index 878707056e65..0fe354efb931 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
| @@ -96,8 +96,8 @@ static struct resource smc91x_resources[] = { | |||
| 96 | .flags = IORESOURCE_MEM, | 96 | .flags = IORESOURCE_MEM, |
| 97 | }, | 97 | }, |
| 98 | [1] = { | 98 | [1] = { |
| 99 | .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)), | 99 | .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)), |
| 100 | .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)), | 100 | .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)), |
| 101 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | 101 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
| 102 | } | 102 | } |
| 103 | }; | 103 | }; |
| @@ -502,7 +502,7 @@ static struct i2c_board_info saar_i2c_info[] = { | |||
| 502 | .type = "da9034", | 502 | .type = "da9034", |
| 503 | .addr = 0x34, | 503 | .addr = 0x34, |
| 504 | .platform_data = &saar_da9034_info, | 504 | .platform_data = &saar_da9034_info, |
| 505 | .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)), | 505 | .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)), |
| 506 | }, | 506 | }, |
| 507 | }; | 507 | }; |
| 508 | 508 | ||