diff --git a/[refs] b/[refs]
index adc02f533cef..3770d5c9317d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4602b88d9743b5f20655de8078fb42e9fd25581f
+refs/heads/master: 4b47b0eefc37fe3bf6bffb4507c8b6df5b14348d
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index fa36094aa0f9..d00168b1f662 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -46,7 +46,13 @@ extern int pci_msi_quirk;
 #else
 #define pci_msi_quirk 0
 #endif
+
+#ifdef CONFIG_PCI_MSI
 void disable_msi_mode(struct pci_dev *dev, int pos, int type);
+#else
+static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
+#endif
+
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct class_device_attribute class_device_attr_cpuaffinity;