3 files changed, 5 insertions, 7 deletions
diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c
index c61669995d..e4d86be27f 100644
--- a/src/northbridge/intel/haswell/acpi.c
+++ b/src/northbridge/intel/haswell/acpi.c
@@ -38,9 +38,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	u32 pciexbar_reg;
 	int max_buses;
 
-	dev = dev_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_SB, 0);
-	if (!dev)
-		dev = dev_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_IB, 0);
+	dev = dev_find_slot(0, PCI_DEVFN(0, 0));
 	if (!dev)
 		return current;
 
diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index bbb51aaf81..3a1803858a 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -204,8 +204,8 @@ struct ied_header {
 	u8 reserved[34];
 } __attribute__ ((packed));
 
-#define PCI_DEVICE_ID_SB 0x0104
-#define PCI_DEVICE_ID_IB 0x0154
+#define PCI_DEVICE_ID_HSW_MOBILE 0x0c04
+#define PCI_DEVICE_ID_HSW_ULT 0x0a04
 
 #ifdef __SMM__
 void intel_northbridge_haswell_finalize_smm(void);
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index d20a40b53c..c8c1704ba4 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -583,13 +583,13 @@ static struct device_operations mc_ops = {
 static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {
 	.ops    = &mc_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = 0x0c04, /* Mobile Haswell */
+	.device = PCI_DEVICE_ID_HSW_MOBILE,
 };
 
 static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
 	.ops    = &mc_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = 0x0a04, /* ULT Haswell */
+	.device = PCI_DEVICE_ID_HSW_ULT,
 };
 
 static void cpu_bus_init(device_t dev)