diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
| commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
| tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /drivers/mtd/maps/ebony.c | |
| parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
| parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) | |
| download | linux-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.gz | |
Pull release into acpica branch
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 b9d9cf4854b6..60a6e51d662f 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; |