Commit d9a682a5 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1e8b0416

arch/arm/mach-clps711x/include/mach/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -95,10 +95,6 @@ 
#include <asm/hardware/cs89712.h>



/* dynamic ioremap() areas */

#define FLASH_START      0x00000000

#define FLASH_SIZE       0x800000

#define FLASH_WIDTH      4



#define SRAM_START       0x60000000

#define SRAM_SIZE        0xc000

#define SRAM_WIDTH       4

arch/arm/mach-clps7500/core.c

+3 −3
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ static struct map_desc cl7500_io_desc[] __initdata = { 
		.length		= ISA_SIZE,

		.type		= MT_DEVICE

	}, {	/* Flash	*/

		.virtual	= FLASH_BASE,

		.pfn		= __phys_to_pfn(FLASH_START),

		.length		= FLASH_SIZE,

		.virtual	= CLPS7500_FLASH_BASE,

		.pfn		= __phys_to_pfn(CLPS7500_FLASH_START),

		.length		= CLPS7500_FLASH_SIZE,

		.type		= MT_DEVICE

	}, {	/* LED		*/

		.virtual	= LED_BASE,

arch/arm/mach-clps7500/include/mach/hardware.h

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#define ISA_SIZE		0x00010000

#define ISA_BASE		0xe1000000



#define FLASH_START		0x01000000	/* XXX */

#define FLASH_SIZE		0x01000000

#define FLASH_BASE		0xe2000000

#define CLPS7500_FLASH_START	0x01000000	/* XXX */

#define CLPS7500_FLASH_SIZE	0x01000000

#define CLPS7500_FLASH_BASE	0xe2000000



#define LED_START		0x0302B000

#define LED_SIZE		0x00001000

arch/arm/mach-h720x/include/mach/boards.h

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#ifdef CONFIG_ARCH_H7202



/* FLASH */

#define FLASH_VIRT		0xd0000000

#define FLASH_PHYS		0x00000000

#define FLASH_SIZE		0x02000000

#define H720X_FLASH_VIRT	0xd0000000

#define H720X_FLASH_PHYS	0x00000000

#define H720X_FLASH_SIZE	0x02000000



/* onboard LAN controller */

# define ETH0_PHYS		0x08000000

drivers/mtd/maps/cdb89712.c

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
#include <linux/mtd/partitions.h>







#define FLASH_START      0x00000000

#define FLASH_SIZE       0x800000

#define FLASH_WIDTH      4



static struct mtd_info *flash_mtd;