diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 04:08:49 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 04:08:49 +0000 |
| commit | 56580bb422e5f542da19c057f348dd39634138e7 (patch) | |
| tree | ae02ad21b38d26b1675977a1d19e5da6fb69c52d /arch/arm/mach-mvebu/addr-map.c | |
| parent | 4e76b1b2329b4a19adfacd187bc2920f68126a95 (diff) | |
| parent | 73d9cdca1ced6ab32be363b58699039bd82b062a (diff) | |
| download | linux-56580bb422e5f542da19c057f348dd39634138e7.tar.gz linux-56580bb422e5f542da19c057f348dd39634138e7.tar.bz2 linux-56580bb422e5f542da19c057f348dd39634138e7.zip | |
Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Diffstat (limited to 'arch/arm/mach-mvebu/addr-map.c')
| -rw-r--r-- | arch/arm/mach-mvebu/addr-map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/addr-map.c b/arch/arm/mach-mvebu/addr-map.c index 595f6b722a8f..ab9b3bd4fef5 100644 --- a/arch/arm/mach-mvebu/addr-map.c +++ b/arch/arm/mach-mvebu/addr-map.c @@ -78,7 +78,7 @@ armada_cfg_base(const struct orion_addr_map_cfg *cfg, int win) if (win < 8) offset = (win << 4); else - offset = ARMADA_WINDOW_8_PLUS_OFFSET + (win << 3); + offset = ARMADA_WINDOW_8_PLUS_OFFSET + ((win - 8) << 3); return cfg->bridge_virt_base + offset; } |