Russell King 7124cb96ca 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>		2011-11-05 22:26:40 +00:00
..
addr-map.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
arcom-pcmcia.h
audio.h
balloon3.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
bitfield.h
camera.h
colibri.h
corgi.h	treewide: transciever/transceiver spelling fixes	2011-06-24 11:20:14 +02:00
csb726.h
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
dma.h
entry-macro.S
eseries-gpio.h
eseries-irq.h
gpio-pxa.h	ARM: PXA: fix gpio-pxa.h build errors	2011-11-05 22:26:40 +00:00
gpio.h	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
gumstix.h
h5000.h
hardware.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
hx4700.h
idp.h
io.h
irda.h
irqs.h	ARM: pxa: move declarations from generic.h to <soc>.h	2011-07-12 19:50:32 +08:00
littleton.h	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
lpd270.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
lubbock.h
magician.h	ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO	2011-07-11 14:43:29 +08:00
mainstone.h
mfp-pxa2xx.h
mfp-pxa3xx.h
mfp-pxa25x.h
mfp-pxa27x.h
mfp-pxa300.h
mfp-pxa320.h
mfp-pxa930.h
mfp.h
mioa701.h
mmc.h
mtd-xip.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
mxm8x10.h
ohci.h
palm27x.h	ARM: pxa: fix building error by palm27x_lcd_init() when FB_PXA not defined	2011-10-07 12:21:19 +08:00
palmasoc.h
palmld.h
palmt5.h
palmtc.h
palmte2.h
palmtreo.h
palmtx.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
palmz72.h
pata_pxa.h
pcm027.h
pcm990_baseboard.h
pm.h	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
poodle.h
pxa2xx-regs.h
pxa3xx-regs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
pxa3xx-u2d.h
pxa3xx.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa25x-udc.h
pxa25x.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa27x-udc.h	treewide: transciever/transceiver spelling fixes	2011-06-24 11:20:14 +02:00
pxa27x.h	ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available	2011-10-08 21:02:44 +08:00
pxa95x.h	ARM: pxa: pxa95x/saarb depends on pxa3xx code	2011-10-08 21:03:00 +08:00
pxa300.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa320.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa930.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa930_rotary.h
pxa930_trkball.h
pxafb.h	ARM: pxa: make pxafb_smart_*() empty when not enabled	2011-10-08 21:03:04 +08:00
regs-ac97.h
regs-lcd.h
regs-ost.h
regs-rtc.h
regs-u2d.h
regs-uart.h
reset.h
sharpsl_pm.h
smemc.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
spitz.h
system.h
timex.h
tosa.h
tosa_bt.h
trizeps4.h
udc.h
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00
viper.h
vmalloc.h
vpac270.h
z2.h
zeus.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
zylonite.h	ARM: pxa: make zylonite_pxa*_init declaration match code	2011-10-08 21:02:57 +08:00