From: Andrew Morton make headers_check happy. Cc: Alex Chiang Cc: Greg KH Cc: Kenji Kaneshige Cc: Kristen Carlson Accardi Cc: Len Brown Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- include/linux/pci.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff -puN include/linux/pci.h~pci-hotplug-introduce-pci_slot-fix-fix include/linux/pci.h --- a/include/linux/pci.h~pci-hotplug-introduce-pci_slot-fix-fix +++ a/include/linux/pci.h @@ -17,21 +17,10 @@ #ifndef LINUX_PCI_H #define LINUX_PCI_H -#include -#include #include /* The pci register defines */ struct pci_vpd; -/* pci_slot represents a physical slot */ -struct pci_slot { - struct pci_bus *bus; /* The bus this slot is on */ - struct list_head list; /* node in list of slots on this bus */ - struct hotplug_slot *hotplug; /* Hotplug info (migrate over time) */ - unsigned char number; /* PCI_SLOT(pci_dev->devfn) */ - struct kobject kobj; -}; - /* * The PCI interface treats multi-function devices as independent * devices. The slot/function address of each device is encoded @@ -60,12 +49,22 @@ struct pci_slot { #include #include #include +#include #include #include /* Include the ID list */ #include +/* pci_slot represents a physical slot */ +struct pci_slot { + struct pci_bus *bus; /* The bus this slot is on */ + struct list_head list; /* node in list of slots on this bus */ + struct hotplug_slot *hotplug; /* Hotplug info (migrate over time) */ + unsigned char number; /* PCI_SLOT(pci_dev->devfn) */ + struct kobject kobj; +}; + /* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { pci_mmap_io, _