diff --git a/[refs] b/[refs]
index d9fb95192eaf..d5498b7f569c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce588cd563e6b817adb0c7d03b3ed9c74cadc27
+refs/heads/master: e2de84920d9489f7fd87fa4b04d996d569def4fa
diff --git a/trunk/include/asm-mips/pci.h b/trunk/include/asm-mips/pci.h
index 092900f11654..049f01f648ed 100644
--- a/trunk/include/asm-mips/pci.h
+++ b/trunk/include/asm-mips/pci.h
@@ -167,4 +167,17 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev)
 /* Do platform specific device initialization at pci_enable_device() time */
 extern int pcibios_plat_dev_init(struct pci_dev *dev);
 
+static inline struct resource *
+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
+{
+	struct resource *root = NULL;
+
+	if (res->flags & IORESOURCE_IO)
+		root = &ioport_resource;
+	if (res->flags & IORESOURCE_MEM)
+		root = &iomem_resource;
+
+	return root;
+}
+
 #endif /* _ASM_PCI_H */