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]
/
arch
/
cris
/
arch-v10
/
drivers
/
axisflashmap.c
diff --git
a/arch/cris/arch-v10/drivers/axisflashmap.c
b/arch/cris/arch-v10/drivers/axisflashmap.c
index
fb7d485
..
56b038c
100644
(file)
--- a/
arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/
arch/cris/arch-v10/drivers/axisflashmap.c
@@
-11,6
+11,9
@@
* partition split defined below.
*
* $Log: axisflashmap.c,v $
* partition split defined below.
*
* $Log: axisflashmap.c,v $
+ * Revision 1.11 2004/11/15 10:27:14 starvik
+ * Corrected typo (Thanks to Milton Miller <miltonm@bga.com>).
+ *
* Revision 1.10 2004/08/16 12:37:22 starvik
* Merge of Linux 2.6.8
*
* Revision 1.10 2004/08/16 12:37:22 starvik
* Merge of Linux 2.6.8
*
@@
-137,6
+140,7
@@
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
#include <linux/mtd/concat.h>
#include <linux/mtd/map.h>
@@
-161,7
+165,7
@@
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==2
#define flash_data __u16
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==4
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==2
#define flash_data __u16
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==4
-#define flash_data __u
16
+#define flash_data __u
32
#endif
/* From head.S */
#endif
/* From head.S */