diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-31 09:59:00 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-31 09:59:00 +1000 |
| commit | 3d00d4ff11686895925f46265f4a78dc78196c2e (patch) | |
| tree | c488b013ed7c77c199dd5cd961354a27fabab112 /arch/powerpc/platforms | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| parent | 895443c1c98a21198a0a5265041dc7ad14936d63 (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 11 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index eeba0a70e46..69d668c072a 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -171,6 +171,17 @@ config ISS4xx help This option enables support for the IBM ISS simulation environment +config ICON + bool "Icon" + depends on 44x + default n + select PPC44x_SIMPLE + select 440SPe + select PCI + select PPC4xx_PCI_EXPRESS + help + This option enables support for the AMCC PPC440SPe evaluation board. + #config LUAN # bool "Luan" # depends on 44x diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index e8c23ccaa1f..5f7a29d7f59 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -61,7 +61,8 @@ static char *board[] __initdata = { "amcc,redwood", "amcc,sequoia", "amcc,taishan", - "amcc,yosemite" + "amcc,yosemite", + "mosaixtech,icon" }; static int __init ppc44x_probe(void) |