diff options
| author | Paul Mackerras | 2007-02-07 04:05:13 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2007-02-07 04:05:13 +0100 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /arch/powerpc/Kconfig | |
| parent | [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call (diff) | |
| parent | Linux 2.6.20 (diff) | |
| download | kernel-qcow2-linux-8423200553113cc031caa9b147f6150a8e26545c.tar.gz kernel-qcow2-linux-8423200553113cc031caa9b147f6150a8e26545c.tar.xz kernel-qcow2-linux-8423200553113cc031caa9b147f6150a8e26545c.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 5f80f0b828f2..aeb53096acf7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -492,6 +492,7 @@ config PPC_MAPLE select PPC_NATIVE select PPC_RTAS select MMIO_NVRAM + select ATA_NONSTANDARD if ATA default n help This option enables support for the Maple 970FX Evaluation Board. @@ -533,12 +534,15 @@ config PPC_IBM_CELL_BLADE select UDBG_RTAS_CONSOLE config PPC_PS3 - bool "Sony PS3" + bool "Sony PS3 (incomplete)" depends on PPC_MULTIPLATFORM && PPC64 select PPC_CELL help This option enables support for the Sony PS3 game console and other platforms using the PS3 hypervisor. + Support for this platform is not yet complete, so + enabling this will not result in a bootable kernel on a + PS3 system. config PPC_CELLEB bool "Toshiba's Cell Reference Set 'Celleb' Architecture" |