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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 17 insertions, 2 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8de5f9ff4ade..808d2ef80e2f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -117,6 +117,9 @@ config GENERIC_BUG
         default y
         depends on BUG
 
+config SYS_SUPPORTS_APM_EMULATION
+        bool
+
 #
 # Powerpc uses the slab allocator to manage its ptes and the
 # page structs of ptes are used for splitting the page table
@@ -136,6 +139,11 @@ config DEFAULT_UIMAGE
           Used to allow a board to specify it wants a uImage built by default
         default n
 
+config PPC64_SWSUSP
+        bool
+        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
+        default y
+
 menu "Processor support"
 choice
         prompt "Processor Type"
@@ -206,6 +214,7 @@ config 40x
 config 44x
         bool "AMCC 44x"
         select PPC_DCR_NATIVE
+        select WANT_DEVICE_TREE
 
 config E200
         bool "Freescale e200"
@@ -270,9 +279,14 @@ config PPC_OF_PLATFORM_PCI
         depends on PPC64 # not supported on 32 bits yet
         default n
 
+config 4xx
+        bool
+        depends on 40x || 44x
+        default y
+
 config BOOKE
         bool
-        depends on E200 || E500
+        depends on E200 || E500 || 44x
         default y
 
 config FSL_BOOKE
@@ -669,11 +683,12 @@ config MCA
 config PCI
         bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                 || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-                || MPC7448HPC2 || PPC_PS3
+                || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
         default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
                 && !PPC_85xx && !PPC_86xx
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
+        select ARCH_SUPPORTS_MSI
         help
           Find out whether your system includes a PCI bus. PCI is the name of
           a bus system, i.e. the way the CPU talks to the other stuff inside