diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-13 10:02:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-13 10:05:03 -0500 |
| commit | 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320 (patch) | |
| tree | 24b4085ac1fca3fce15880b9d936dc2f17718654 /drivers/mtd | |
| parent | d9a682a592ff5905d328c648fd30ee7fa12ce8ab (diff) | |
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/cdb89712.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c index d7bc4299b19c..8d92d8db9a98 100644 --- a/drivers/mtd/maps/cdb89712.c +++ b/drivers/mtd/maps/cdb89712.c | |||
| @@ -14,11 +14,20 @@ | |||
| 14 | #include <linux/mtd/map.h> | 14 | #include <linux/mtd/map.h> |
| 15 | #include <linux/mtd/partitions.h> | 15 | #include <linux/mtd/partitions.h> |
| 16 | 16 | ||
| 17 | 17 | /* dynamic ioremap() areas */ | |
| 18 | #define FLASH_START 0x00000000 | 18 | #define FLASH_START 0x00000000 |
| 19 | #define FLASH_SIZE 0x800000 | 19 | #define FLASH_SIZE 0x800000 |
| 20 | #define FLASH_WIDTH 4 | 20 | #define FLASH_WIDTH 4 |
| 21 | 21 | ||
| 22 | #define SRAM_START 0x60000000 | ||
| 23 | #define SRAM_SIZE 0xc000 | ||
| 24 | #define SRAM_WIDTH 4 | ||
| 25 | |||
| 26 | #define BOOTROM_START 0x70000000 | ||
| 27 | #define BOOTROM_SIZE 0x80 | ||
| 28 | #define BOOTROM_WIDTH 4 | ||
| 29 | |||
| 30 | |||
| 22 | static struct mtd_info *flash_mtd; | 31 | static struct mtd_info *flash_mtd; |
| 23 | 32 | ||
| 24 | struct map_info cdb89712_flash_map = { | 33 | struct map_info cdb89712_flash_map = { |