Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix sys_pciconfig_iobase bus matching
  [POWERPC] PS3: add not complete comment to kconfig
  [POWERPC] ps3_free_io_irq: Fix inverted error check
  [POWERPC] PS3: Fix uniprocessor kernel build

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b268c417c0bf..d6abe495c6b0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -526,12 +526,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_NATIVE
         bool