Merge branch 'pci/misc' into next

* pci/misc: PCI: Drop CONFIG_KEXEC_CORE ifdeffery
mariux64 · Oct 3, 2016 · 5485e49 · 5485e49
2 parents 64ea3b9 + ad618c9
commit 5485e49
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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