diff options
author | Mikael Starvik <mikael.starvik@axis.com> | 2005-07-27 14:44:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:25:59 -0400 |
commit | 7e9204265b4ec6680fad9abc7a78b94087983916 (patch) | |
tree | 50ff709f7d37193bb56599a4e1646509d8e353ff /arch/cris/arch-v10/drivers/axisflashmap.c | |
parent | 059163cabc01a15b9e2cf10e5de5b6dc06e0da1f (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.c | 5 |
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 fb7d4855ea62..11ab3836aac6 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -11,6 +11,9 @@ | |||
11 | * partition split defined below. | 11 | * partition split defined below. |
12 | * | 12 | * |
13 | * $Log: axisflashmap.c,v $ | 13 | * $Log: axisflashmap.c,v $ |
14 | * Revision 1.11 2004/11/15 10:27:14 starvik | ||
15 | * Corrected typo (Thanks to Milton Miller <miltonm@bga.com>). | ||
16 | * | ||
14 | * Revision 1.10 2004/08/16 12:37:22 starvik | 17 | * Revision 1.10 2004/08/16 12:37:22 starvik |
15 | * Merge of Linux 2.6.8 | 18 | * Merge of Linux 2.6.8 |
16 | * | 19 | * |
@@ -161,7 +164,7 @@ | |||
161 | #elif CONFIG_ETRAX_FLASH_BUSWIDTH==2 | 164 | #elif CONFIG_ETRAX_FLASH_BUSWIDTH==2 |
162 | #define flash_data __u16 | 165 | #define flash_data __u16 |
163 | #elif CONFIG_ETRAX_FLASH_BUSWIDTH==4 | 166 | #elif CONFIG_ETRAX_FLASH_BUSWIDTH==4 |
164 | #define flash_data __u16 | 167 | #define flash_data __u32 |
165 | #endif | 168 | #endif |
166 | 169 | ||
167 | /* From head.S */ | 170 | /* From head.S */ |