linux/arch/arm
Arnd Bergmann e0347c5238 ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
The symbol "GPIO24_SSP1_SFRM" is defined in both mfp-pxa27x.h and
mfp-pxa25x.h. Since the macro is not actually used in the cm-x2xx.c
file, but it includes both headers, a safe workaround should be
to just undefine it from the .c file. This is a bit hacky and
the headers should be fixed to not both define it, but for now
it gets us around an annoying warning.

Without this patch, building cm_x2xx_defconfig results in:

In file included from arch/arm/mach-pxa/include/mach-pxa/pxa27x.h:7:0,
                 from arch/arm/mach-pxa/cm-x2xx.c:25:
arch/arm/mach-pxa/include/mach-pxa/mfp-pxa27x.h:215:0: warning: "GPIO24_SSP1_SFRM" redefined [enabled by default]
arch/arm/mach-pxa/include/mach-pxa/mfp-pxa25x.h:111:0: note: this is the location of the previous definition

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Mike Rapoport <mike@compulab.co.il>
2012-10-04 10:20:23 +02:00
..
boot Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2012-09-22 12:40:16 -07:00
common
configs Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes 2012-09-04 21:41:35 -07:00
include/asm ARM: reserve syscall 378 for kcmp 2012-09-21 17:56:25 +01:00
kernel ARM: reserve syscall 378 for kcmp 2012-09-21 17:56:25 +01:00
lib ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop 2012-09-09 17:28:48 +01:00
mach-at91 ARM: at91/clock: fix PLLA overclock warning 2012-08-23 15:00:09 +02:00
mach-bcmring
mach-clps711x
mach-cns3xxx
mach-davinci
mach-dove ARM: Orion: Set eth packet size csum offload limit 2012-08-15 13:58:09 +00:00
mach-ebsa110
mach-ep93xx
mach-exynos Merge branch 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2012-08-23 17:03:49 +02:00
mach-footbridge
mach-gemini ARM: gemini: fix the gemini build 2012-09-04 22:17:34 -07:00
mach-h720x
mach-highbank
mach-imx ARM i.MX25: Make timer irq work again 2012-09-18 16:46:50 +02:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-kirkwood Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-09-08 16:22:43 -07:00
mach-ks8695
mach-l7200/include/mach
mach-lpc32xx
mach-mmp ARM: mmp: fix potential NULL dereference 2012-08-10 22:32:24 +08:00
mach-msm
mach-mv78xx0 Merge branch 'fixes-for-v3.6' of git://git.infradead.org/users/jcooper/linux into fixes 2012-08-15 18:18:29 +02:00
mach-mvebu
mach-mxs phy/micrel: Rename KS80xx to KSZ80xx 2012-09-24 15:54:33 -04:00
mach-netx
mach-nomadik
mach-omap1
mach-omap2 Some hwmod, clockdomain, am335x fixes against v3.6-rc4. 2012-09-05 10:09:31 -07:00
mach-orion5x ARM: Orion5x: Fix too small coherent pool. 2012-09-26 16:48:47 -07:00
mach-picoxcell
mach-pnx4008
mach-prima2
mach-pxa ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM 2012-10-04 10:20:23 +02:00
mach-realview
mach-rpc
mach-s3c24xx Merge branch 'v3.6-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2012-08-23 17:03:49 +02:00
mach-s3c64xx
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100
mach-shark ARM: shark: fix shark_pci_init return code 2012-10-04 10:19:51 +02:00
mach-shmobile Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes 2012-09-18 07:41:25 -07:00
mach-socfpga
mach-spear3xx
mach-spear6xx
mach-spear13xx
mach-tegra
mach-u300
mach-ux500 Merge branch 'randconfig/mach' into fixes 2012-08-23 17:30:54 +02:00
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mach-zynq
mm ARM: dma-mapping: Fix potential memory leak in atomic_pool_init() 2012-09-24 08:35:03 +02:00
net
nwfpe
oprofile
plat-iop
plat-mxc ARM i.MX25: Make timer irq work again 2012-09-18 16:46:50 +02:00
plat-nomadik
plat-omap Merge branch 'fixes-wakeupgen' into fixes 2012-09-05 10:06:08 -07:00
plat-orion ARM: Orion: Set eth packet size csum offload limit 2012-08-15 13:58:09 +00:00
plat-pxa
plat-s3c24xx
plat-samsung ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate 2012-09-18 10:05:34 +09:00
plat-spear
plat-versatile
tools
vfp ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled 2012-08-11 09:15:57 +01:00
Kconfig Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-09-08 16:22:43 -07:00
Kconfig-nommu
Kconfig.debug ARM: 7521/1: Fix semihosting Kconfig text 2012-09-07 20:40:44 +01:00
Makefile ARM: 7513/1: Make sure dtc is built before running it 2012-09-07 20:36:44 +01:00