diff options
author | Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | 2009-06-12 04:51:12 +0200 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-06-15 06:37:07 +0200 |
commit | 97f8a27a5cfb08c9ce3abc90aaafb791759aed94 (patch) | |
tree | a72396a128ca1e2da050a695605e7687e07380b3 /arch/arm/mach-orion5x/addr-map.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff) | |
download | linux-97f8a27a5cfb08c9ce3abc90aaafb791759aed94.tar.xz linux-97f8a27a5cfb08c9ce3abc90aaafb791759aed94.zip |
[ARM] orion5x: increment window counter after adding sram mapping
Without incrementing the counter the next window setup will overwrite
the SRAM mapping.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/addr-map.c')
-rw-r--r-- | arch/arm/mach-orion5x/addr-map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index 6f3f77d031d0..d78731edebb6 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c @@ -200,6 +200,6 @@ void __init orion5x_setup_pcie_wa_win(u32 base, u32 size) int __init orion5x_setup_sram_win(void) { - return setup_cpu_win(win_alloc_count, ORION5X_SRAM_PHYS_BASE, + return setup_cpu_win(win_alloc_count++, ORION5X_SRAM_PHYS_BASE, ORION5X_SRAM_SIZE, TARGET_SRAM, ATTR_SRAM, -1); } |