projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge by hand (conflicts between pending drivers and kfree cleanups)
[powerpc.git]
/
drivers
/
mtd
/
maps
/
fortunet.c
diff --git
a/drivers/mtd/maps/fortunet.c
b/drivers/mtd/maps/fortunet.c
index
00f7bbe
..
c6bf4e1
100644
(file)
--- a/
drivers/mtd/maps/fortunet.c
+++ b/
drivers/mtd/maps/fortunet.c
@@
-1,6
+1,6
@@
/* fortunet.c memory map
*
/* fortunet.c memory map
*
- * $Id: fortunet.c,v 1.
9 2004/11/04 13:24:14
gleixner Exp $
+ * $Id: fortunet.c,v 1.
11 2005/11/07 11:14:27
gleixner Exp $
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-212,7
+212,7
@@
int __init init_fortunet(void)
map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical,
map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical,
- map_regions[ix].map_info.virt =
+ map_regions[ix].map_info.virt =
ioremap_nocache(
map_regions[ix].window_addr_physical,
map_regions[ix].map_info.size);
ioremap_nocache(
map_regions[ix].window_addr_physical,
map_regions[ix].map_info.size);