aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/40x/ppc40x_simple.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 11:24:25 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 11:24:25 +1100
commit1e7342e7789fa2ca9202701467428726cbcfd649 (patch)
treee0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/platforms/40x/ppc40x_simple.c
parent78c5c68a4cf4329d17abfa469345ddf323d4fd62 (diff)
parent228d55053397e6d5325ca179c7ffe331de2846d3 (diff)
downloadlinux-stericsson-1e7342e7789fa2ca9202701467428726cbcfd649.tar.gz
Merge remote-tracking branch 'jwb/next' into next
Conflicts: arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/platforms/40x/ppc40x_simple.c')
-rw-r--r--arch/powerpc/platforms/40x/ppc40x_simple.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index ecac237827ef..97612068fae3 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -55,6 +55,7 @@ static const char *board[] __initdata = {
"amcc,haleakala",
"amcc,kilauea",
"amcc,makalu",
+ "apm,klondike",
"est,hotfoot",
"plathome,obs600"
};