diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:54:37 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:54:37 -0500 |
commit | e532c37858fdcc18e9a91d24c2e22cd21aa22561 (patch) | |
tree | d2d27707914fa6690774be7051ac98e6fce4e755 /drivers/mtd/maps/ebony.c | |
parent | 87199134b4a85de56a7508c551ab3b3a3ee35035 (diff) | |
parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/ebony.c')
-rw-r--r-- | drivers/mtd/maps/ebony.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c index b9d9cf4854b..60a6e51d662 100644 --- a/drivers/mtd/maps/ebony.c +++ b/drivers/mtd/maps/ebony.c @@ -1,6 +1,6 @@ /* - * $Id: ebony.c,v 1.15 2004/12/09 18:39:54 holindho Exp $ - * + * $Id: ebony.c,v 1.16 2005/11/07 11:14:26 gleixner Exp $ + * * Mapping for Ebony user flash * * Matt Porter <mporter@kernel.crashing.org> @@ -21,7 +21,6 @@ #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> #include <linux/config.h> -#include <linux/version.h> #include <asm/io.h> #include <asm/ibm44x.h> #include <platforms/4xx/ebony.h> @@ -85,7 +84,7 @@ int __init init_ebony(void) small_flash_base = EBONY_SMALL_FLASH_LOW2; else small_flash_base = EBONY_SMALL_FLASH_LOW1; - + if (EBONY_BOOT_SMALL_FLASH(fpga0_reg) && !EBONY_ONBRD_FLASH_EN(fpga0_reg)) large_flash_base = EBONY_LARGE_FLASH_LOW; |