diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 23:49:19 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 23:49:19 -0500 |
commit | acf2c9685fb8295cb62a623d7358a1cfde8b07ea (patch) | |
tree | 417313447aa8da946c74a5afcf1085c7b1744fb6 /arch/sh/mm/ioremap.c | |
parent | d57d64080ddc0ff13fcffc898b6251074a482ba1 (diff) |
sh: Kill off duplicate address alignment in ioremap_fixed().
This is already taken care of in the top-level ioremap, and now that
no one should be calling ioremap_fixed() directly we can simply throw the
mapping displacement in as an additional argument.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/ioremap.c')
-rw-r--r-- | arch/sh/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index 85b420d00622..bb03308e8408 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c | |||
@@ -68,7 +68,7 @@ __ioremap_caller(unsigned long phys_addr, unsigned long size, | |||
68 | * If we can't yet use the regular approach, go the fixmap route. | 68 | * If we can't yet use the regular approach, go the fixmap route. |
69 | */ | 69 | */ |
70 | if (!mem_init_done) | 70 | if (!mem_init_done) |
71 | return ioremap_fixed(phys_addr, size, pgprot); | 71 | return ioremap_fixed(phys_addr, offset, size, pgprot); |
72 | 72 | ||
73 | /* | 73 | /* |
74 | * Ok, go for it.. | 74 | * Ok, go for it.. |