diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/platforms/40x | |
parent | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 (diff) | |
parent | 228d55053397e6d5325ca179c7ffe331de2846d3 (diff) |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/platforms/40x')
-rw-r--r-- | arch/powerpc/platforms/40x/Kconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/40x/ppc40x_simple.c | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index bac24a09131..baae85584b1 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig | |||
@@ -196,3 +196,14 @@ config IBM405_ERR51 | |||
196 | # bool | 196 | # bool |
197 | # depends on !STB03xxx && PPC4xx_DMA | 197 | # depends on !STB03xxx && PPC4xx_DMA |
198 | # default y | 198 | # default y |
199 | # | ||
200 | |||
201 | config APM8018X | ||
202 | bool "APM8018X" | ||
203 | depends on 40x | ||
204 | default n | ||
205 | select PPC40x_SIMPLE | ||
206 | help | ||
207 | This option enables support for the AppliedMicro APM8018X evaluation | ||
208 | board. | ||
209 | |||
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c index ecac237827e..97612068fae 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 = { | |||
55 | "amcc,haleakala", | 55 | "amcc,haleakala", |
56 | "amcc,kilauea", | 56 | "amcc,kilauea", |
57 | "amcc,makalu", | 57 | "amcc,makalu", |
58 | "apm,klondike", | ||
58 | "est,hotfoot", | 59 | "est,hotfoot", |
59 | "plathome,obs600" | 60 | "plathome,obs600" |
60 | }; | 61 | }; |