git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
ebony.c
diff --git
a/drivers/mtd/maps/ebony.c
b/drivers/mtd/maps/ebony.c
index
b9d9cf4
..
60a6e51
100644
(file)
--- a/
drivers/mtd/maps/ebony.c
+++ b/
drivers/mtd/maps/ebony.c
@@
-1,6
+1,6
@@
/*
/*
- * $Id: ebony.c,v 1.1
5 2004/12/09 18:39:54 holindho
Exp $
- *
+ * $Id: ebony.c,v 1.1
6 2005/11/07 11:14:26 gleixner
Exp $
+ *
* Mapping for Ebony user flash
*
* Matt Porter <mporter@kernel.crashing.org>
* 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/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>
#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;
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;
if (EBONY_BOOT_SMALL_FLASH(fpga0_reg) &&
!EBONY_ONBRD_FLASH_EN(fpga0_reg))
large_flash_base = EBONY_LARGE_FLASH_LOW;