diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/mtd/maps/alchemy-flash.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/mtd/maps/alchemy-flash.c')
| -rw-r--r-- | drivers/mtd/maps/alchemy-flash.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/mtd/maps/alchemy-flash.c b/drivers/mtd/maps/alchemy-flash.c index 7fc8097e41d2..84fbe0e8c47e 100644 --- a/drivers/mtd/maps/alchemy-flash.c +++ b/drivers/mtd/maps/alchemy-flash.c | |||
| @@ -1,10 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Flash memory access on AMD Alchemy evaluation boards | 2 | * Flash memory access on AMD Alchemy evaluation boards |
| 3 | * | 3 | * |
| 4 | * $Id: alchemy-flash.c,v 1.2 2005/11/07 11:14:26 gleixner Exp $ | ||
| 5 | * | ||
| 6 | * (C) 2003, 2004 Pete Popov <ppopov@embeddedalley.com> | 4 | * (C) 2003, 2004 Pete Popov <ppopov@embeddedalley.com> |
| 7 | * | ||
| 8 | */ | 5 | */ |
| 9 | 6 | ||
| 10 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| @@ -18,12 +15,6 @@ | |||
| 18 | 15 | ||
| 19 | #include <asm/io.h> | 16 | #include <asm/io.h> |
| 20 | 17 | ||
| 21 | #ifdef DEBUG_RW | ||
| 22 | #define DBG(x...) printk(x) | ||
| 23 | #else | ||
| 24 | #define DBG(x...) | ||
| 25 | #endif | ||
| 26 | |||
| 27 | #ifdef CONFIG_MIPS_PB1000 | 18 | #ifdef CONFIG_MIPS_PB1000 |
| 28 | #define BOARD_MAP_NAME "Pb1000 Flash" | 19 | #define BOARD_MAP_NAME "Pb1000 Flash" |
| 29 | #define BOARD_FLASH_SIZE 0x00800000 /* 8MB */ | 20 | #define BOARD_FLASH_SIZE 0x00800000 /* 8MB */ |