diff --git a/[refs] b/[refs]
index 3669e572cd6e..161dcaad6d99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c53a25543e69d23caf2514c3ce3e734e0a68f4e9
+refs/heads/master: 7477dc291b5618da02e2aee388e3a4815c90906f
diff --git a/trunk/arch/tile/kernel/pci.c b/trunk/arch/tile/kernel/pci.c
index b56d12bf5900..e25722658c14 100644
--- a/trunk/arch/tile/kernel/pci.c
+++ b/trunk/arch/tile/kernel/pci.c
@@ -400,16 +400,6 @@ void pcibios_set_master(struct pci_dev *dev)
 	/* No special bus mastering setup handling. */
 }
 
-/*
- * This can be called from the generic PCI layer, but doesn't need to
- * do anything.
- */
-char __devinit *pcibios_setup(char *str)
-{
-	/* Nothing needs to be done. */
-	return str;
-}
-
 /*
  * This is called from the generic Linux layer.
  */