---

yaml --- r: 316521 b: refs/heads/master c: 11206c9 h: refs/heads/master i: 316519: 769e904 v: v3
git-mirror · Jul 5, 2012 · 4f169f4 · 4f169f4
1 parent 1c49e32
commit 4f169f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 483dae5893e11e00a0f9dbd75788844fae2221a0
+refs/heads/master: 11206c93c85b2968616f9ef1672f3889f55992d4
diff --git a/trunk/arch/mips/pmc-sierra/yosemite/ht.c b/trunk/arch/mips/pmc-sierra/yosemite/ht.c
@@ -395,17 +395,6 @@ void __init pcibios_init(void)
         pci_scan_bus(3, &titan_pci_ops, NULL);
 }
 
-/*
- * for parsing "pci=" kernel boot arguments.
- */
-char *pcibios_setup(char *str)
-{
-        printk(KERN_INFO "rr: pcibios_setup\n");
-        /* Nothing to do for now.  */
-
-        return str;
-}
-
 unsigned __init int pcibios_assign_all_busses(void)
 {
         /* We want to use the PCI bus detection done by PMON */