---

yaml
---
r: 138551
b: refs/heads/master
c: 8d73f10
h: refs/heads/master
i:
  138549: 0b77011
  138547: 1244e8e
  138543: 96acadf
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e41c615a70f2a91ca35b455fdcf025f78e11207e
+refs/heads/master: 8d73f102d9606fe217a9577a437f84b9fed6d45d

trunk/arch/powerpc/Kconfig

@@ -313,7 +313,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
 
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
-	depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL
+	depends on BOOK3S && EXPERIMENTAL
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot

trunk/arch/powerpc/Kconfig.debug

@@ -129,7 +129,7 @@ config BDI_SWITCH
 
 config BOOTX_TEXT
 	bool "Support for early boot text console (BootX or OpenFirmware only)"
-	depends on PPC_OF && PPC_MULTIPLATFORM
+	depends on PPC_OF && PPC_BOOK3S
 	help
 	  Say Y here to see progress messages from the boot firmware in text
 	  mode. Requires either BootX or Open Firmware.

trunk/arch/powerpc/include/asm/hw_irq.h

@@ -129,7 +129,7 @@ static inline int irqs_disabled_flags(unsigned long flags)
  * interrupt-retrigger: should we handle this via lost interrupts and IPIs
  * or should we not care like we do now ? --BenH.
  */
-struct hw_interrupt_type;
+struct irq_chip;
 
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_HW_IRQ_H */