]> err.no Git - linux-2.6/commitdiff
[POWERPC] Allow combined iSeries and MULTIPLATFORM build
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 25 Sep 2006 03:49:58 +0000 (13:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 3 Oct 2006 06:49:31 +0000 (16:49 +1000)
This will build with ISERIES, PSERIES and PMAC64 selected, but will only
boot on iSeries so far.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
arch/powerpc/Kconfig

index de1ef2fa1a206f2ba7031c66a304f534852371fb..0969fe89df83e20a402e4c4c2eeec1685ba57a6c 100644 (file)
@@ -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