git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
addr-map.c
diff --git
a/arch/arm/mach-orion5x/addr-map.c
b/arch/arm/mach-orion5x/addr-map.c
index
6f3f77d
..
d78731e
100644
(file)
--- 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)
{
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);
}
ORION5X_SRAM_SIZE, TARGET_SRAM, ATTR_SRAM, -1);
}