projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[deliverable/linux.git]
/
arch
/
powerpc
/
sysdev
/
cpm2.c
diff --git
a/arch/powerpc/sysdev/cpm2.c
b/arch/powerpc/sysdev/cpm2.c
index fd969f0e31214615bec76854e79b7d67c86a3cd3..eb5927212fab39134177bbbcd478fcfac85fabc8 100644
(file)
--- a/
arch/powerpc/sysdev/cpm2.c
+++ b/
arch/powerpc/sysdev/cpm2.c
@@
-61,7
+61,7
@@
EXPORT_SYMBOL(cpm2_immr);
void __init cpm2_reset(void)
{
#ifdef CONFIG_PPC_85xx
- cpm2_immr = ioremap(
CPM_MAP_ADDR
, CPM_MAP_SIZE);
+ cpm2_immr = ioremap(
get_immrbase() + 0x80000
, CPM_MAP_SIZE);
#else
cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);
#endif
This page took
0.027637 seconds
and
5
git commands to generate.