projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into next
[deliverable/linux.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
setup.c
diff --git
a/arch/powerpc/platforms/powermac/setup.c
b/arch/powerpc/platforms/powermac/setup.c
index 9b78f5300c2478196287f78f9d7ccdbf28f71c4d..45936c9ed0ec5a1db19ee11d84facdcd85412740 100644
(file)
--- a/
arch/powerpc/platforms/powermac/setup.c
+++ b/
arch/powerpc/platforms/powermac/setup.c
@@
-746,4
+746,7
@@
define_machine(powermac) {
#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC64)
.cpu_die = pmac_cpu_die,
#endif
+#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32)
+ .cpu_die = generic_mach_cpu_die,
+#endif
};
This page took
0.026154 seconds
and
5
git commands to generate.