From 2c995d5cf8390c022ee35e21e35440d5ef74788a Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 13 Nov 2008 15:02:41 +0000
Subject: [PATCH] --- yaml --- r: 118943 b: refs/heads/master c:
 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320 h: refs/heads/master i:   118941:
 30a8d86a273f2de71fc523ba4bc143324ff6c7ca   118939:
 bb218a49737c121ec05073f62e96b7cecf9926ed   118935:
 0b06d48f81bd27791587ee8073be80fdc7bab318   118927:
 c894d0e4ec16e52ece1d40ca25dc953377cdcfc5   118911:
 ab1561f23867c4a538c4aeaa11b7d01bd678eeaf v: v3

---
 [refs]                                         |  2 +-
 .../arm/mach-clps711x/include/mach/hardware.h  | 18 ------------------
 trunk/drivers/mtd/maps/cdb89712.c              | 11 ++++++++++-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 0481a1df52c1..2222abf21a34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9a682a592ff5905d328c648fd30ee7fa12ce8ab
+refs/heads/master: 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320
diff --git a/trunk/arch/arm/mach-clps711x/include/mach/hardware.h b/trunk/arch/arm/mach-clps711x/include/mach/hardware.h
index 7cc675c93e20..b3ebe9e4871f 100644
--- a/trunk/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -94,16 +94,6 @@
 #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
@@ -194,14 +184,6 @@
 #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
  */
diff --git a/trunk/drivers/mtd/maps/cdb89712.c b/trunk/drivers/mtd/maps/cdb89712.c
index d7bc4299b19c..8d92d8db9a98 100644
--- a/trunk/drivers/mtd/maps/cdb89712.c
+++ b/trunk/drivers/mtd/maps/cdb89712.c
@@ -14,11 +14,20 @@
 #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 = {