iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7124cb96ca
linux/arch/arm/mach-pxa/include/mach
History
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 [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus 2009-12-13 21:42:58 +08:00
audio.h ALSA: Allow passing platform_data for pxa2xx-ac97 2009-08-13 22:19:37 +01:00
balloon3.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
bitfield.h
camera.h pxa_camera: remove init() callback 2010-02-26 15:11:00 -03:00
colibri.h ARM: pxa/colibri: use correct SD detect pin 2011-02-09 23:05:03 +08:00
corgi.h treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
csb726.h [ARM] pxa: add initial support for Cogent CSB726 board 2009-03-13 17:10:44 +08:00
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 [ARM] pxa: introduce plat-pxa for PXA common code and add DMA support 2009-03-23 10:11:31 +08:00
entry-macro.S [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y 2009-11-13 16:25:46 +08:00
eseries-gpio.h ASoC: machine support for Toshiba e740 PDA 2009-01-19 16:15:41 +00:00
eseries-irq.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
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 [ARM] pxa: removing dead ARCH_GUMSTIX_ORIG 2010-08-05 14:32:31 +08:00
h5000.h
hardware.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
hx4700.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
idp.h
io.h arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices" 2010-09-22 17:22:38 -07:00
irda.h [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
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 ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
magician.h ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO 2011-07-11 14:43:29 +08:00
mainstone.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
mfp-pxa2xx.h [ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin config 2010-05-11 17:24:59 +02:00
mfp-pxa3xx.h [ARM] pxa: move common MFP handling code into plat-pxa 2009-03-23 10:11:34 +08:00
mfp-pxa25x.h [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
mfp-pxa27x.h [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +08:00
mfp-pxa300.h ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300 2010-08-30 09:59:43 +08:00
mfp-pxa320.h [ARM] pxa: add additional mfp definitions for pxa320 2009-06-05 10:32:55 +08:00
mfp-pxa930.h ARM: pxa: append tavorevb3 support 2010-10-09 17:07:24 +08:00
mfp.h [ARM] pxa: remove duplicate mfp definition in mach 2009-09-10 18:49:24 +08:00
mioa701.h
mmc.h [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
mtd-xip.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
mxm8x10.h [ARM] pxa: fix typo in mxm8x10.h 2010-03-02 10:24:14 +08:00
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 [ARM] pxa/palm27x: General fix for Palm27x aSoC driver 2009-04-19 21:56:54 +08:00
palmld.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmt5.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmtc.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmte2.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmtreo.h [ARM] pxa/treo: add Palm Centro 685 support 2009-12-01 09:02:49 +08:00
palmtx.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
palmz72.h ARM: pxa: PalmZ72: Add OV9640 camera support 2011-03-16 16:32:47 +08:00
pata_pxa.h [ARM] pata_pxa: DMA-capable PATA driver 2010-06-18 15:07:32 +08:00
pcm027.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
pcm990_baseboard.h
pm.h ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
poodle.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
pxa2xx-regs.h ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
pxa3xx-regs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
pxa3xx-u2d.h ARM: pxa: add U2D controller and ULPI driver for pxa3xx 2010-10-08 16:21:17 +08:00
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_rotary.h
pxa930_trkball.h
pxa930.h ARM: pxa: add common header file for pxa3xx 2011-07-12 19:45:20 +08:00
pxafb.h ARM: pxa: make pxafb_smart_*() empty when not enabled 2011-10-08 21:03:04 +08:00
regs-ac97.h [ARM] pxa: fix missing of __REG() definition for ac97 registers access 2009-01-19 11:39:36 +08:00
regs-lcd.h
regs-ost.h [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
regs-rtc.h [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
regs-u2d.h [ARM] pxa: add missing new line to regs-u2d.h 2010-05-06 11:12:10 +08:00
regs-uart.h
reset.h [ARM] pxa: allow gpio_reset drive high during normal work 2009-05-18 21:52:09 +08:00
sharpsl_pm.h [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
smemc.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
spitz.h [ARM] pxa/spitz: Rework spitz 2010-08-05 14:32:41 +08:00
system.h [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
timex.h
tosa_bt.h
tosa.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
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 [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus 2009-12-13 21:42:58 +08:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00
vpac270.h [ARM] pxa/vpac270: remove TS_IRQ magic number 2010-05-11 17:25:03 +02:00
z2.h ARM: PXA: Z2: Fix libertas init/tear down sequences 2011-03-16 14:56:02 +01:00
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