aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/arch-v10/drivers/axisflashmap.c
diff options
context:
space:
mode:
authorMikael Starvik <mikael.starvik@axis.com>2005-07-27 11:44:34 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:25:59 -0700
commit7e9204265b4ec6680fad9abc7a78b94087983916 (patch)
tree50ff709f7d37193bb56599a4e1646509d8e353ff /arch/cris/arch-v10/drivers/axisflashmap.c
parent059163cabc01a15b9e2cf10e5de5b6dc06e0da1f (diff)
[PATCH] CRIS update: drivers
Updates to device drivers. * Use I/O and DMA allocators. * Use wait_event_interruptible instead of interrutiple_sleep_on. * Added spinlocks SMP. * Changed restore_flags to local_irq_restore etc. * Updated IDE driver include to fit 2.6.12. Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/arch-v10/drivers/axisflashmap.c')
-rw-r--r--arch/cris/arch-v10/drivers/axisflashmap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index fb7d4855ea6..11ab3836aac 100644
--- 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 $
+ * 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
*
@@ -161,7 +164,7 @@
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==2
#define flash_data __u16
#elif CONFIG_ETRAX_FLASH_BUSWIDTH==4
-#define flash_data __u16
+#define flash_data __u32
#endif
/* From head.S */