diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
commit | 24665cd00dd06c741ef6268515ca9e6d3cda5c57 (patch) | |
tree | d55e925db2b78bc6529965fa6b1df07a76b56610 /arch/ppc64/Kconfig | |
parent | fed2fc18a4567d613cd35115322257c6c6c710e9 (diff) | |
parent | d7152fe14cad075d6dd4ee4194acd131aed0244e (diff) | |
download | linux-24665cd00dd06c741ef6268515ca9e6d3cda5c57.tar.gz linux-24665cd00dd06c741ef6268515ca9e6d3cda5c57.tar.bz2 linux-24665cd00dd06c741ef6268515ca9e6d3cda5c57.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/Kconfig')
-rw-r--r-- | arch/ppc64/Kconfig | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index 6448231cb106..cb27068bfcd4 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -77,6 +77,10 @@ config PPC_PSERIES bool " IBM pSeries & new iSeries" default y +config PPC_BPA + bool " Broadband Processor Architecture" + depends on PPC_MULTIPLATFORM + config PPC_PMAC depends on PPC_MULTIPLATFORM bool " Apple G5 based machines" @@ -106,6 +110,21 @@ config PPC_OF bool default y +config XICS + depends on PPC_PSERIES + bool + default y + +config MPIC + depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE + bool + default y + +config BPA_IIC + depends on PPC_BPA + bool + default y + # VMX is pSeries only for now until somebody writes the iSeries # exception vectors for it config ALTIVEC @@ -292,7 +311,7 @@ config MSCHUNKS config PPC_RTAS bool - depends on PPC_PSERIES + depends on PPC_PSERIES || PPC_BPA default y config RTAS_PROC |