Merge branch 'pci/cleanup' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 17 Apr 2013 16:31:34 +0000 (10:31 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 17 Apr 2013 16:31:34 +0000 (10:31 -0600)
commit723ec4d06cb2eed481436cfe008f5f63c45e88fd
treee59112af8616e8fbc0cc6c2219b49fd2f05bfc41
parenta3b6bbd5774c13dab89d72f79976ba762913b2f2
parentf39d5b72913e2a9ff00ba5ab145ee05a888b1286
Merge branch 'pci/cleanup' into next

* pci/cleanup:
  PCI: Remove "extern" from function declarations
  PCI: Warn about failures instead of "must_check" functions
  PCI: Remove __must_check from definitions
  PCI: Remove unused variables
  PCI: Move cpci_hotplug_init() proto to header file
  PCI: Make local functions/structs static
  PCI: Fix missing prototype for pcie_port_acpi_setup()

Conflicts:
drivers/pci/hotplug/acpiphp.h
include/linux/pci.h
drivers/pci/bus.c
drivers/pci/hotplug/acpiphp.h
drivers/pci/pcie/aer/aer_inject.c
include/linux/pci.h