diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-23 13:56:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-23 13:56:44 -0400 |
commit | fb7a6d4e7da219f895d156cad00e2b6373e2494f (patch) | |
tree | 79f5f36386124f010533b67f0414c4bf86527770 /include/linux/pci.h | |
parent | 230dec61313dc5f5720311d0b492f69f5466b0a4 (diff) | |
parent | 8c838d7384c6e5c0583ec6bbb2e6f6dba19feda1 (diff) | |
download | blackbird-op-linux-fb7a6d4e7da219f895d156cad00e2b6373e2494f.tar.gz blackbird-op-linux-fb7a6d4e7da219f895d156cad00e2b6373e2494f.zip |
Merge git://github.com/Jkirsher/net-next
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 8c230cbcbb48..581d2e2e5b00 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -174,6 +174,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1, /* Device configuration is irrevocably lost if disabled into D3 */ PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2, + /* Provide indication device is assigned by a Virtual Machine Manager */ + PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4, }; enum pci_irq_reroute_variant { |