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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
setup.c
diff --git
a/arch/powerpc/platforms/pseries/setup.c
b/arch/powerpc/platforms/pseries/setup.c
index
c319d04
..
0007241
100644
(file)
--- a/
arch/powerpc/platforms/pseries/setup.c
+++ b/
arch/powerpc/platforms/pseries/setup.c
@@
-378,7
+378,7
@@
static int __init pSeries_init_panel(void)
return 0;
}
-
arch_initcall(
pSeries_init_panel);
+
machine_arch_initcall(pseries,
pSeries_init_panel);
static int pseries_set_dabr(unsigned long dabr)
{