Arnd Bergmann f39c42f5f9 ARM: pxa: cm-x2xx: avoid duplicate macro warnings ... In an old commit, we worked around the duplicate definition of GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both pxa25x and pxa27x. Apparently the problem has come back and we now have four additional duplicate symbols that cause warnings: In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0, from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27: /git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0) This uses the same hack as before and undefines all symbols that are defined more than once. Fortunately, cm-x2xx does not need any of these. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>		2015-12-15 23:50:00 +01:00
..
boot	RTC fixes for 4.4	2015-11-29 17:30:41 -08:00
common	dmaengine updates for 4.4-rc1	2015-11-10 10:05:17 -08:00
configs	ARM: s3c64xx: multiplatform support	2015-12-01 21:50:26 +01:00
crypto
firmware
include	Merge branch 'mmp/multiplatform' into next/multiplatform	2015-12-15 23:45:45 +01:00
kernel	ARM: make xscale iwmmxt code multiplatform aware	2015-12-01 21:44:24 +01:00
kvm	KVM: arm/arm64: Fix preemptible timer active state crazyness	2015-11-24 18:04:00 +01:00
lib
mach-alpine
mach-asm9260
mach-at91	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-axxia
mach-bcm	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-berlin	arm: berlin: add CPU hotplug support	2015-10-15 21:14:28 +02:00
mach-clps711x
mach-cns3xxx
mach-davinci	ARM: davinci: make headers more local	2015-12-01 21:52:51 +01:00
mach-digicolor	ARM: digicolor: select pinctrl/gpio driver	2015-10-15 22:27:30 +02:00
mach-dove	ARM: dove: Fix legacy get_irqnr_and_base	2015-11-25 14:59:12 +00:00
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos	ARM: SoC cleanups for v4.4	2015-11-10 14:48:36 -08:00
mach-footbridge	ARM: debug-ll: rework footbridge handling	2015-12-15 23:43:29 +01:00
mach-gemini	ARM: gemini: remove unnecessary mdio-gpio includes	2015-10-21 19:50:43 -07:00
mach-highbank
mach-hisi
mach-imx	ARM: imx: add platform irq type setting in gpc	2015-11-23 13:12:07 +08:00
mach-integrator
mach-iop13xx	ARM: iop13xx: make headers more local	2015-12-01 21:52:51 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone
mach-ks8695	ARM: ks8695: make headers more local	2015-12-01 21:52:50 +01:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-meson
mach-mmp	ARM: mmp: avoid unused functions	2015-12-01 21:44:33 +01:00
mach-moxart
mach-mv78xx0
mach-mvebu	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-mxs
mach-netx	ARM: netx: remove unused mach/param.h	2015-12-01 21:52:51 +01:00
mach-nomadik
mach-nspire
mach-omap1	ARM: omap1: make headers more local	2015-12-01 21:52:50 +01:00
mach-omap2	ARM: OMAP4+: SMP: use lockless clkdm/pwrdm api in omap4_boot_secondary	2015-11-25 11:03:20 -08:00
mach-orion5x	ARM: orion5x: Fix legacy get_irqnr_and_base	2015-11-25 15:01:00 +00:00
mach-picoxcell
mach-prima2	ARM: Remove __ref on hotplug cpu die path	2015-10-22 09:55:03 -07:00
mach-pxa	ARM: pxa: cm-x2xx: avoid duplicate macro warnings	2015-12-15 23:50:00 +01:00
mach-qcom	ARM: Remove __ref on hotplug cpu die path	2015-10-22 09:55:03 -07:00
mach-realview	ARM: Remove __ref on hotplug cpu die path	2015-10-22 09:55:03 -07:00
mach-rockchip
mach-rpc
mach-s3c24xx	Samsung SoC updates for v4.4	2015-10-26 10:18:41 +09:00
mach-s3c64xx	ARM: s3c64xx: allow building without board support	2015-12-01 21:50:26 +01:00
mach-s5pv210
mach-sa1100
mach-shmobile	ARM: shmobile: r8a7793: proper constness with __initconst	2015-11-22 17:13:13 -08:00
mach-socfpga
mach-spear	ARM: SoC cleanups for v4.4	2015-11-10 14:48:36 -08:00
mach-sti
mach-stm32
mach-sunxi	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-tegra	ARM: SoC platform updates for v4.4	2015-11-10 14:56:23 -08:00
mach-u300	spi: Updates for v4.4	2015-11-05 13:15:12 -08:00
mach-uniphier	ARM: uniphier: rework SMP operations to use trampoline code	2015-10-27 09:20:53 +09:00
mach-ux500	ARM: SoC cleanups for v4.4	2015-11-10 14:48:36 -08:00
mach-versatile
mach-vexpress	ARM: Remove __ref on hotplug cpu die path	2015-10-22 09:55:03 -07:00
mach-vt8500
mach-w90x900	ARM: w90x900: make headers more local	2015-12-01 21:52:51 +01:00
mach-zx	ARM: zx: only build power domain code when CONFIG_PM=y	2015-11-19 16:16:45 +01:00
mach-zynq
mm	ARM: mohawk: allow building with MMU disabled	2015-12-01 21:44:25 +01:00
net	bpf, arm: start flushing icache range from header	2015-11-16 14:40:49 -05:00
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa	ARM: mmp: move into ARCH_MULTIPLATFORM	2015-12-01 21:44:31 +01:00
plat-samsung	ARM: s3c64xx: allow building without board support	2015-12-01 21:50:26 +01:00
plat-versatile
probes
tools
vdso	ARM: 8449/1: fix bug in vdsomunge swab32 macro	2015-10-29 15:20:15 +00:00
vfp
xen	mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd	2015-11-06 17:50:42 -08:00
Kconfig	Merge branch 'mmp/multiplatform' into next/multiplatform	2015-12-15 23:45:45 +01:00
Kconfig-nommu
Kconfig.debug	Merge branch 's3c64xx/multiplatform' into next/multiplatform	2015-12-15 23:45:22 +01:00
Makefile