Arnd Bergmann 47589c4af9 ARM: rpc: rename RAM_SIZE macro ... The RAM_SIZE macro in mach/hardware.h conflicts with macros of the same name in multiple drivers, leading to annoying build warnings: In file included from drivers/net/ethernet/cirrus/cs89x0.c:79:0: drivers/net/ethernet/cirrus/cs89x0.h:324:0: error: "RAM_SIZE" redefined [-Werror] #define RAM_SIZE 0x1000 /* The card has 4k bytes or RAM */ ^ In file included from /git/arm-soc/arch/arm/mach-rpc/include/mach/io.h:16:0, from /git/arm-soc/arch/arm/include/asm/io.h:194, from /git/arm-soc/include/linux/scatterlist.h:8, from /git/arm-soc/include/linux/dmaengine.h:24, from /git/arm-soc/include/linux/netdevice.h:38, from /git/arm-soc/drivers/net/ethernet/cirrus/cs89x0.c:54: arch/arm/mach-rpc/include/mach/hardware.h:28:0: note: this is the location of the previous definition #define RAM_SIZE 0x10000000 We don't use RAM_SIZE/RAM_START at all, so we could just remove them, but it might be nice to leave them for documentation purposes, so this renames them to RPC_RAM_SIZE/RPC_RAM_START in order to avoid the build warnings Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2017-07-27 22:57:38 +02:00
..
boot	mvebu fixes for 4.13 (part 1)	2017-07-27 12:54:35 +02:00
common	arm: implement ->dma_supported instead of ->set_dma_mask	2017-06-28 06:54:49 -07:00
configs	This is the big bulk of pin control changes for the v4.13 series:	2017-07-06 11:38:59 -07:00
crypto	crypto: arm/crc32 - enable module autoloading based on CPU feature bits	2017-06-01 12:55:42 +08:00
firmware	…
include	Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-07-21 10:41:19 -07:00
kernel	pci-v4.13-fixes-1	2017-07-14 12:36:20 -07:00
kvm	Merge branch 'kvmarm-master/master' into HEAD	2017-06-15 09:35:15 +01:00
lib	…
mach-actions	ARM: owl: smp: Drop bogus holding pen	2017-07-03 14:31:47 +02:00
mach-alpine	…
mach-artpec	…
mach-asm9260	…
mach-aspeed	clocksource/drivers/fttmr010: Merge Moxa into FTTMR010	2017-06-12 10:45:10 +02:00
mach-at91	Fixes for 4.12:	2017-06-18 23:12:36 -07:00
mach-axxia	…
mach-bcm	ARM: SoC platform updates	2017-07-04 14:34:51 -07:00
mach-berlin	…
mach-clps711x	clocksource/drivers: Rename CLKSRC_OF to TIMER_OF	2017-06-14 12:01:03 +02:00
mach-cns3xxx	ARM: remove duplicate 'const' annotations'	2017-05-19 10:12:55 +02:00
mach-davinci	ARM: davinci: normalize clk API	2017-07-27 13:15:29 +02:00
mach-digicolor	…
mach-dove	ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()	2017-06-28 15:13:55 -05:00
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	ARM: ep93xx: normalize clk API	2017-07-27 22:57:24 +02:00
mach-exynos	…
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	ARM: imx6ull: Make suspend/resume work like on 6ul	2017-06-07 11:38:40 +08:00
mach-integrator	…
mach-iop13xx	ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()	2017-06-28 15:13:55 -05:00
mach-iop32x	…
mach-iop33x	…
mach-ixp4xx	scripts/spelling.txt: add regsiter -> register spelling mistake	2017-05-08 17:15:13 -07:00
mach-keystone	…
mach-ks8695	…
mach-lpc18xx	…
mach-lpc32xx	ARM/dmaengine: pl08x: pass reasonable memcpy settings	2017-05-24 09:44:32 +05:30
mach-mediatek	clocksource/drivers: Rename clocksource_probe to timer_probe	2017-06-14 11:59:16 +02:00
mach-meson	arm: meson: select the clock controller for Meson8	2017-06-09 11:15:36 -07:00
mach-mmp	…
mach-moxart	clocksource/drivers/fttmr010: Merge Moxa into FTTMR010	2017-06-12 10:45:10 +02:00
mach-mv78xx0	ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()	2017-06-28 15:13:55 -05:00
mach-mvebu	ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code	2017-07-18 11:26:30 +02:00
mach-mxs	…
mach-netx	…
mach-nomadik	…
mach-nspire	…
mach-omap1	ARM: OMAP1: Fix a typo in a comment line	2017-06-06 23:54:13 -07:00
mach-omap2	Few fixes for omaps for issues found recently:	2017-07-27 12:50:35 +02:00
mach-orion5x	ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()	2017-06-28 15:13:55 -05:00
mach-oxnas	…
mach-picoxcell	…
mach-prima2	ARM: prima2: remove redundant select CPU_V7	2017-06-18 19:13:47 -07:00
mach-pxa	ARM: sa1100/pxa: fix MTD_XIP build	2017-07-27 13:14:41 +02:00
mach-qcom	…
mach-realview	…
mach-rockchip	ARM: SoC platform updates	2017-07-04 14:34:51 -07:00
mach-rpc	ARM: rpc: rename RAM_SIZE macro	2017-07-27 22:57:38 +02:00
mach-s3c24xx	clocksource/drivers: Rename CLKSRC_OF to TIMER_OF	2017-06-14 12:01:03 +02:00
mach-s3c64xx	dmaengine updates for 4.13-rc1	2017-07-08 12:36:50 -07:00
mach-s5pv210	…
mach-sa1100	ARM: sa1100: normalize clk API	2017-07-27 13:15:50 +02:00
mach-shmobile	ARM: SoC platform updates	2017-07-04 14:34:51 -07:00
mach-socfpga	…
mach-spear	dmaengine updates for 4.13-rc1	2017-07-08 12:36:50 -07:00
mach-sti	…
mach-stm32	ARM: stm32: Introduce MACH_STM32F469 flag	2017-06-18 20:10:27 -07:00
mach-sunxi	clocksource/drivers: Rename clocksource_probe to timer_probe	2017-06-14 11:59:16 +02:00
mach-tango	…
mach-tegra	…
mach-u300	clocksource/drivers: Rename clocksource_probe to timer_probe	2017-06-14 11:59:16 +02:00
mach-uniphier	…
mach-ux500	…
mach-versatile	…
mach-vexpress	…
mach-vt8500	…
mach-w90x900	ARM: w90x900: normalize clk API	2017-07-27 22:57:36 +02:00
mach-zx	…
mach-zynq	clocksource/drivers: Rename clocksource_probe to timer_probe	2017-06-14 11:59:16 +02:00
mm	Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm	2017-07-08 12:17:25 -07:00
net	arm: use set_memory.h header	2017-05-08 17:15:13 -07:00
nwfpe	…
oprofile	…
plat-iop	…
plat-omap	…
plat-orion	…
plat-pxa	…
plat-samsung	…
plat-versatile	…
probes	arm: Prevent hotplug rwsem recursion	2017-05-26 10:10:46 +02:00
tools	…
vdso	…
vfp	…
xen	This is the first pull request for the new dma-mapping subsystem	2017-07-06 19:20:54 -07:00
Kconfig	Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm	2017-07-08 12:17:25 -07:00
Kconfig-nommu	…
Kconfig.debug	SoC for 4.13:	2017-06-18 22:53:20 -07:00
Makefile	ARM: Prepare Actions Semi S500	2017-06-21 18:08:41 +02:00