]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ARM: rpc: rename RAM_SIZE macro
authorArnd Bergmann <arnd@arndb.de>
Sat, 16 Jan 2016 23:37:36 +0000 (00:37 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Jul 2017 20:57:38 +0000 (22:57 +0200)
commit47589c4af939bcc01da5d9a803fe0413c72a31c2
tree4e5b9df78d34830f78a2ccdeda8ab3a8fed2ab9e
parentbd7fefe1f06ca6cc2d1503def95bf53e2549a44b
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>
arch/arm/mach-rpc/include/mach/hardware.h