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

diff --combined arch/powerpc/Kconfig
index b268c417c0bf2b23f5eb5ad839c5bd527a574906,f4d1f31c14fafdd561e733e68a73f6a36190e2f8..d6abe495c6b083a228a6507ac03505c5f0f2a122
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -484,7 -484,6 +484,7 @@@ config PPC_MAPL
        select PPC_970_NAP
        select PPC_NATIVE
        select PPC_RTAS
 +      select ATA_NONSTANDARD if ATA
        default n
        help
            This option enables support for the Maple 970FX Evaluation Board.
@@@ -526,12 -525,15 +526,15 @@@ config PPC_IBM_CELL_BLAD
        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