diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-04 07:02:27 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 07:02:27 +0200 |
| commit | c730f5b621afa33e9f4939da9078669162ebff4e (patch) | |
| tree | ac78a2cea0fbf365ef659c26ab192e263debb544 /arch/powerpc/Kconfig | |
| parent | [POWERPC] Don't try to just continue if xmon has no input device (diff) | |
| parent | [POWERPC] iSeries has no legacy I/O (diff) | |
| download | linux-c730f5b621afa33e9f4939da9078669162ebff4e.tar.xz linux-c730f5b621afa33e9f4939da9078669162ebff4e.zip | |
Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 032e6ab5d3c4..5342f3fdb083 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM RS/6000 machine, an Apple machine, or a PReP, CHRP, Maple or Cell-based machine. -config PPC_ISERIES - bool "IBM Legacy iSeries" - depends on PPC64 - config EMBEDDED6xx bool "Embedded 6xx/7xx/7xxx-based board" depends on PPC32 && (BROKEN||BROKEN_ON_SMP) @@ -365,6 +361,10 @@ config PPC_PSERIES select PPC_UDBG_16550 default y +config PPC_ISERIES + bool "IBM Legacy iSeries" + depends on PPC_MULTIPLATFORM && PPC64 + config PPC_CHRP bool "Common Hardware Reference Platform (CHRP) based machines" depends on PPC_MULTIPLATFORM && PPC32 |