aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-18 14:14:16 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-06-18 14:14:16 -0400
commit140217ae3fbabc7b718b5595fd251ce2afcb3bc1 (patch)
tree1c3d1a367c04203a88b4677376cbd6c8e08d1c65 /include/linux/pci.h
parente822a007047fb84cd068bfa35a682015e0fe19b9 (diff)
parent0bdb3b213ac64f9a16e59d57660174543eaa01f0 (diff)
Merge branch 'topic/jan-intx-masking' into next
* topic/jan-intx-masking: PCI: add Ralink RT2800 broken INTx masking quirk PCI: add Chelsio T310 10GbE NIC broken INTx masking quirk PCI: add infrastructure for devices with broken INTx masking
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 43a007cbdf65..c739df91bac9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -324,6 +324,7 @@ struct pci_dev {
324 unsigned int is_hotplug_bridge:1; 324 unsigned int is_hotplug_bridge:1;
325 unsigned int __aer_firmware_first_valid:1; 325 unsigned int __aer_firmware_first_valid:1;
326 unsigned int __aer_firmware_first:1; 326 unsigned int __aer_firmware_first:1;
327 unsigned int broken_intx_masking:1;
327 pci_dev_flags_t dev_flags; 328 pci_dev_flags_t dev_flags;
328 atomic_t enable_cnt; /* pci_enable_device has been called */ 329 atomic_t enable_cnt; /* pci_enable_device has been called */
329 330