From 287bd126b2d780f40085ed44e645822670350c51 Mon Sep 17 00:00:00 2001
From: Myron Stowe <myron.stowe@redhat.com>
Date: Mon, 25 Jun 2012 21:32:39 -0600
Subject: [PATCH] --- yaml --- r: 316531 b: refs/heads/master c:
 29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae h: refs/heads/master i:   316529:
 222cefe1d4943c51371fe2e7da81a8f539acb949   316527:
 564161410d4784e1602c5ab4bb7ea9572f3252f5 v: v3

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

diff --git a/[refs] b/[refs]
index 8b38c3e3746b..bc12dd9ec2b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15fa325bebbe11184a051ed64965164fca8c1df2
+refs/heads/master: 29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae
diff --git a/trunk/arch/xtensa/kernel/pci.c b/trunk/arch/xtensa/kernel/pci.c
index eb30e356f5be..3a2cae4558b3 100644
--- a/trunk/arch/xtensa/kernel/pci.c
+++ b/trunk/arch/xtensa/kernel/pci.c
@@ -46,7 +46,6 @@
  * pcibios_fixups
  * pcibios_align_resource
  * pcibios_fixup_bus
- * pcibios_setup
  * pci_bus_add_device
  * pci_mmap_page_range
  */
@@ -206,11 +205,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 	}
 }
 
-char __init *pcibios_setup(char *str)
-{
-	return str;
-}
-
 void pcibios_set_master(struct pci_dev *dev)
 {
 	/* No special bus mastering setup handling */