summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/40x/ppc40x_simple.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 10:35:52 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 10:35:52 +1000
commit10f52dd9febf0302bc458a6ea7979767dfa9f3b6 (patch)
tree9048c0001147e958eb85a138e71237317a70fb54 /arch/powerpc/platforms/40x/ppc40x_simple.c
parentec3cf2ece22a8ede7478bf38e2a818986322662b (diff)
parent336ff735425d2709c4bb3f2a55f7565e8170ce7a (diff)
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/platforms/40x/ppc40x_simple.c')
-rw-r--r--arch/powerpc/platforms/40x/ppc40x_simple.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index f40ac9b8f99f..5fd5a5974001 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -51,7 +51,10 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
* board.c file for it rather than adding it to this list.
*/
static char *board[] __initdata = {
- "amcc,acadia"
+ "amcc,acadia",
+ "amcc,haleakala",
+ "amcc,kilauea",
+ "amcc,makalu"
};
static int __init ppc40x_probe(void)