diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-28 11:39:19 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-28 11:39:19 -0700 |
| commit | 3c282db1656733c1267e6af4c22179bb04faf2ef (patch) | |
| tree | 141669ad06cfc2459ec93aeb9d86237328faa61d /include/linux/pci.h | |
| parent | d3fe3988fb24e5ed13b2243b789a652882d3b26c (diff) | |
| parent | 918b4053184c0ca22236e70e299c5343eea35304 (diff) | |
| download | lwn-3c282db1656733c1267e6af4c22179bb04faf2ef.tar.gz lwn-3c282db1656733c1267e6af4c22179bb04faf2ef.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/AER: Report success only when every device has AER-aware driver
Conflicts:
drivers/pci/pcie/aer/aerdrv_core.c
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 5b37d643b6b3..a98a5f9ac1d5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -538,6 +538,9 @@ enum pci_ers_result { /* Device driver is fully recovered and operational */ PCI_ERS_RESULT_RECOVERED = (__force pci_ers_result_t) 5, + + /* No AER capabilities registered for the driver */ + PCI_ERS_RESULT_NO_AER_DRIVER = (__force pci_ers_result_t) 6, }; /* PCI bus error event callbacks */ |