[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 13 Nov 2008 15:02:41 +0000 (15:02 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 13 Nov 2008 15:05:03 +0000 (15:05 +0000)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-clps711x/include/mach/hardware.h
drivers/mtd/maps/cdb89712.c

index 7cc675c93e20d9f60ca7b6a93d544e6099acf78c..b3ebe9e4871fe938585e5cad55eb7390424d25b3 100644 (file)
 #include <asm/hardware/ep7212.h>
 #include <asm/hardware/cs89712.h>
 
-/* dynamic ioremap() areas */
-#define SRAM_START       0x60000000
-#define SRAM_SIZE        0xc000
-#define SRAM_WIDTH       4
-
-#define BOOTROM_START    0x70000000
-#define BOOTROM_SIZE     0x80
-#define BOOTROM_WIDTH    4
-
-
 /* static cdb89712_map_io() areas */
 #define REGISTER_START   0x80000000
 #define REGISTER_SIZE    0x4000
 #define CEIVA_FLASH_SIZE        0x100000
 #define CEIVA_FLASH_WIDTH       2
 
-#define SRAM_START       0x60000000
-#define SRAM_SIZE        0xc000
-#define SRAM_WIDTH       4
-
-#define BOOTROM_START    0x70000000
-#define BOOTROM_SIZE     0x80
-#define BOOTROM_WIDTH    4
-
 /*
  * SED1355 LCD controller
  */
index d7bc4299b19c6b6d404dba070f342e329673a0a8..8d92d8db9a98c0a3c5625ce74fd27a4268070ba4 100644 (file)
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.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
+
+#define BOOTROM_START    0x70000000
+#define BOOTROM_SIZE     0x80
+#define BOOTROM_WIDTH    4
+
+
 static struct mtd_info *flash_mtd;
 
 struct map_info cdb89712_flash_map = {