diff options
| author | Russell King | 2011-11-05 23:03:25 +0100 |
|---|---|---|
| committer | Russell King | 2011-11-05 23:26:40 +0100 |
| commit | 7124cb96cadc5f9990ade39780b672b01bfc6484 (patch) | |
| tree | 227082a57a4f4c34b1b2417bb5be171180f71cf7 /drivers/pcmcia/pxa2xx_cm_x2xx.c | |
| parent | ARM: 7142/1: davinci: mark GPIO implementation complex (diff) | |
| download | kernel-qcow2-linux-7124cb96cadc5f9990ade39780b672b01bfc6484.tar.gz kernel-qcow2-linux-7124cb96cadc5f9990ade39780b672b01bfc6484.tar.xz kernel-qcow2-linux-7124cb96cadc5f9990ade39780b672b01bfc6484.zip | |
ARM: PXA: fix gpio-pxa.h build errors
A mismerge in 43872fa (Merge branch 'depends/rmk/gpio' into next/fixes)
causes these build errors:
In file included from arch/arm/mach-pxa/include/mach/gpio.h:30,
from arch/arm/include/asm/gpio.h:6,
from include/linux/gpio.h:31,
from arch/arm/mach-pxa/generic.c:20:
arch/arm/mach-pxa/include/mach/gpio-pxa.h: In function ■__gpio_is_occupied■:
arch/arm/mach-pxa/include/mach/gpio-pxa.h:121: error: invalid operands to binary >> (have ■void *■ and ■unsigned int■)
arch/arm/mach-pxa/include/mach/gpio-pxa.h:122: error: invalid operands to binary & (have ■void *■ and ■int■)
arch/arm/mach-pxa/include/mach/gpio-pxa.h:129: error: invalid operands to binary & (have ■void *■ and ■int■)
So fix them.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_cm_x2xx.c')
0 files changed, 0 insertions, 0 deletions