From 252991ad5928707af4e83f2a2a37c1662d3319c6 Mon Sep 17 00:00:00 2001
From: Myron Stowe <myron.stowe@redhat.com>
Date: Mon, 25 Jun 2012 21:31:44 -0600
Subject: [PATCH] --- yaml --- r: 316523 b: refs/heads/master c:
 a45639c8d367a93acce1622c8847e9e828fbb1f9 h: refs/heads/master i:   316521:
 4f169f46c24b9c93ebb604f5a559f667a7f20942   316519:
 769e904fd86aca65374d815321b9f45e946faf5f v: v3

---
 [refs]                         | 2 +-
 trunk/arch/parisc/kernel/pci.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bcef5713ad6e..ca1131f1f1d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 938ca5162ec9a835078924447a6f55667e47e857
+refs/heads/master: a45639c8d367a93acce1622c8847e9e828fbb1f9
diff --git a/trunk/arch/parisc/kernel/pci.c b/trunk/arch/parisc/kernel/pci.c
index 24644aca10cb..60309051875e 100644
--- a/trunk/arch/parisc/kernel/pci.c
+++ b/trunk/arch/parisc/kernel/pci.c
@@ -139,11 +139,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 }
 
 
-char *pcibios_setup(char *str)
-{
-	return str;
-}
-
 /*
  * Called by pci_set_master() - a driver interface.
  *