Commit 85ae3970 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

- Allow D3 only if Root Port can signal and wake from D3 so we don't miss
  hotplug events on AMD Yellow Carp (Mario Limonciello)

- Clean up hotplug include files to enable future powerpc cleanup
  (Christophe Leroy)

* pci/hotplug:
  PCI: hotplug: Clean up include files
  PCI/ACPI: Allow D3 only if Root Port can signal and wake from D3
parents 55fd033b b2851926

drivers/pci/hotplug/pnv_php.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pci_hotplug.h>

#include <linux/of_fdt.h>



#include <asm/opal.h>

#include <asm/pnv-pci.h>

drivers/pci/hotplug/rpadlpar_core.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/init.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/pci.h>

#include <linux/string.h>

#include <linux/vmalloc.h>

drivers/pci/hotplug/rpaphp_core.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/of.h>

#include <linux/pci.h>

#include <linux/pci_hotplug.h>

#include <linux/smp.h>
@@ -20,6 +21,7 @@ 
#include <asm/eeh.h>       /* for eeh_add_device() */

#include <asm/rtas.h>		/* rtas_call */

#include <asm/pci-bridge.h>	/* for pci_controller */

#include <asm/prom.h>

#include "../pci.h"		/* for pci_add_new_bus */

				/* and pci_do_scan_bus */

#include "rpaphp.h"

drivers/pci/hotplug/rpaphp_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Send feedback to <lxie@us.ibm.com>

 *

 */

#include <linux/of.h>

#include <linux/pci.h>

#include <linux/string.h>

drivers/pci/hotplug/rpaphp_slot.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/sysfs.h>

#include <linux/of.h>

#include <linux/pci.h>

#include <linux/string.h>

#include <linux/slab.h>