diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
| commit | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (patch) | |
| tree | cad990f58f9ec6d400226dda86718fc10781416e /arch/arm/mach-mv78xx0/addr-map.c | |
| parent | e1000e: add device IDs for i218 (diff) | |
| parent | Fix staging driver use of VM_RESERVED (diff) | |
| download | linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.tar.xz linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0/addr-map.c')
| -rw-r--r-- | arch/arm/mach-mv78xx0/addr-map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index 137e479d15a0..343c435b4176 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/arch/arm/mach-mv78xx0/addr-map.c @@ -48,7 +48,7 @@ static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, i * so we don't need to take that into account here. */ - return (void __iomem *)((win < 8) ? WIN0_OFF(win) : WIN8_OFF(win)); + return (win < 8) ? WIN0_OFF(win) : WIN8_OFF(win); } /* @@ -72,10 +72,10 @@ void __init mv78xx0_setup_cpu_mbus(void) */ if (mv78xx0_core_index() == 0) orion_setup_cpu_mbus_target(&addr_map_cfg, - DDR_WINDOW_CPU0_BASE); + (void __iomem *) DDR_WINDOW_CPU0_BASE); else orion_setup_cpu_mbus_target(&addr_map_cfg, - DDR_WINDOW_CPU1_BASE); + (void __iomem *) DDR_WINDOW_CPU1_BASE); } void __init mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size, |