diff --git a/[refs] b/[refs]
index 54669c8abb39..4e7b5dd2fd72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f3045eca89a2e6fdd1901aafb9e28231d3f31fb
+refs/heads/master: cd0a2bfb77a3edeecd652081e0b1a163d3b0696b
diff --git a/trunk/drivers/pci/Makefile b/trunk/drivers/pci/Makefile
index 083a49fee56a..165274c064bc 100644
--- a/trunk/drivers/pci/Makefile
+++ b/trunk/drivers/pci/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
 obj-$(CONFIG_PARISC) += setup-bus.o
 obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
 obj-$(CONFIG_PPC) += setup-bus.o
+obj-$(CONFIG_FRV) += setup-bus.o
 obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
 obj-$(CONFIG_X86_VISWS) += setup-irq.o
 obj-$(CONFIG_MN10300) += setup-bus.o