diff options
| author | Bjorn Helgaas | 2016-10-03 09:43:20 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-10-03 09:43:20 -0500 |
| commit | 5485e49f71610a005304f8a3617ab2893543a1dc (patch) | |
| tree | 154a90e19ffee658c5dc50348e88d63478ce597f /drivers/pci | |
| parent | 64ea3b99d665d0140cdf5047571e65d8ca28d0e6 (diff) | |
| parent | ad618c9983be3136e9e7209ffd7c4102720d0739 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Drop CONFIG_KEXEC_CORE ifdeffery
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e39a67c8ef39..edd78e04b693 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev) pci_msi_shutdown(pci_dev); pci_msix_shutdown(pci_dev); -#ifdef CONFIG_KEXEC_CORE /* * If this is a kexec reboot, turn off Bus Master bit on the * device to tell it to not continue to do DMA. Don't touch @@ -476,7 +475,6 @@ static void pci_device_shutdown(struct device *dev) */ if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot)) pci_clear_master(pci_dev); -#endif } #ifdef CONFIG_PM |