diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/mtd/maps/fortunet.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/fortunet.c')
| -rw-r--r-- | drivers/mtd/maps/fortunet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/fortunet.c b/drivers/mtd/maps/fortunet.c index 00f7bbe5479e..c6bf4e1219ef 100644 --- a/drivers/mtd/maps/fortunet.c +++ b/drivers/mtd/maps/fortunet.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* fortunet.c memory map | 1 | /* fortunet.c memory map |
| 2 | * | 2 | * |
| 3 | * $Id: fortunet.c,v 1.9 2004/11/04 13:24:14 gleixner Exp $ | 3 | * $Id: fortunet.c,v 1.11 2005/11/07 11:14:27 gleixner Exp $ |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| @@ -212,7 +212,7 @@ int __init init_fortunet(void) | |||
| 212 | 212 | ||
| 213 | map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical, | 213 | map_regions[ix].map_info.phys = map_regions[ix].window_addr_physical, |
| 214 | 214 | ||
| 215 | map_regions[ix].map_info.virt = | 215 | map_regions[ix].map_info.virt = |
| 216 | ioremap_nocache( | 216 | ioremap_nocache( |
| 217 | map_regions[ix].window_addr_physical, | 217 | map_regions[ix].window_addr_physical, |
| 218 | map_regions[ix].map_info.size); | 218 | map_regions[ix].map_info.size); |