Signed-off-by: Andrew Morton --- drivers/pci/probe.c | 1 - include/linux/pci.h | 6 ------ 2 files changed, 7 deletions(-) diff -puN drivers/pci/probe.c~gregkh-pci-msi-07-drop_pci_bus_flags drivers/pci/probe.c --- a/drivers/pci/probe.c~gregkh-pci-msi-07-drop_pci_bus_flags +++ a/drivers/pci/probe.c @@ -351,7 +351,6 @@ pci_alloc_child_bus(struct pci_bus *pare child->parent = parent; child->ops = parent->ops; child->sysdata = parent->sysdata; - child->bus_flags = parent->bus_flags; child->bridge = get_device(&bridge->dev); child->class_dev.class = &pcibus_class; diff -puN include/linux/pci.h~gregkh-pci-msi-07-drop_pci_bus_flags include/linux/pci.h --- a/include/linux/pci.h~gregkh-pci-msi-07-drop_pci_bus_flags +++ a/include/linux/pci.h @@ -95,11 +95,6 @@ enum pci_channel_state { pci_channel_io_perm_failure = (__force pci_channel_state_t) 3, }; -typedef unsigned short __bitwise pci_bus_flags_t; -enum pci_bus_flags { - PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1, -}; - struct pci_cap_saved_state { struct hlist_node next; char cap_nr; @@ -243,7 +238,6 @@ struct pci_bus { char name[48]; unsigned short bridge_ctl; /* manage NO_ISA/FBB/et al behaviors */ - pci_bus_flags_t bus_flags; /* Inherited by child busses */ struct device *bridge; struct class_device class_dev; struct bin_attribute *legacy_io; /* legacy I/O for this bus */ _