Merge remote-tracking branch 'jwb/next' into next

Conflicts:
	arch/powerpc/platforms/40x/ppc40x_simple.c

2 files changed, 12 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index bac24a09131b..baae85584b1c 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -196,3 +196,14 @@ config IBM405_ERR51
 #       bool
 #       depends on !STB03xxx && PPC4xx_DMA
 #       default y
+#
+
+config APM8018X
+        bool "APM8018X"
+        depends on 40x
+        default n
+        select PPC40x_SIMPLE
+        help
+          This option enables support for the AppliedMicro APM8018X evaluation
+          board.
+
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"
 };