diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 2 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 66bd22fec38f..6ed3647b38df 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -978,6 +978,8 @@ int pci_try_reset_slot(struct pci_slot *slot); | |||
978 | int pci_probe_reset_bus(struct pci_bus *bus); | 978 | int pci_probe_reset_bus(struct pci_bus *bus); |
979 | int pci_reset_bus(struct pci_bus *bus); | 979 | int pci_reset_bus(struct pci_bus *bus); |
980 | int pci_try_reset_bus(struct pci_bus *bus); | 980 | int pci_try_reset_bus(struct pci_bus *bus); |
981 | void pci_reset_secondary_bus(struct pci_dev *dev); | ||
982 | void pcibios_reset_secondary_bus(struct pci_dev *dev); | ||
981 | void pci_reset_bridge_secondary_bus(struct pci_dev *dev); | 983 | void pci_reset_bridge_secondary_bus(struct pci_dev *dev); |
982 | void pci_update_resource(struct pci_dev *dev, int resno); | 984 | void pci_update_resource(struct pci_dev *dev, int resno); |
983 | int __must_check pci_assign_resource(struct pci_dev *dev, int i); | 985 | int __must_check pci_assign_resource(struct pci_dev *dev, int i); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 7fa31731c854..6ed0bb73a864 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -6,6 +6,8 @@ | |||
6 | * Do not add new entries to this file unless the definitions | 6 | * Do not add new entries to this file unless the definitions |
7 | * are shared between multiple drivers. | 7 | * are shared between multiple drivers. |
8 | */ | 8 | */ |
9 | #ifndef _LINUX_PCI_IDS_H | ||
10 | #define _LINUX_PCI_IDS_H | ||
9 | 11 | ||
10 | /* Device classes and subclasses */ | 12 | /* Device classes and subclasses */ |
11 | 13 | ||
@@ -2968,3 +2970,5 @@ | |||
2968 | #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 | 2970 | #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 |
2969 | 2971 | ||
2970 | #define PCI_VENDOR_ID_OCZ 0x1b85 | 2972 | #define PCI_VENDOR_ID_OCZ 0x1b85 |
2973 | |||
2974 | #endif /* _LINUX_PCI_IDS_H */ | ||