From 0cc5a6339897a7b68328db3151bd8948ae8daecb Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 18 Apr 2008 13:53:57 -0700
Subject: [PATCH] --- yaml --- r: 91699 b: refs/heads/master c:
 a391f19717984a8f70756b29074298f379fcfdbc h: refs/heads/master i:   91697:
 b02d9e18085e148ba45d3d4d00e36a86114df526   91695:
 f5620d4fe7155fc2992ce6718e6e6430be43f75a v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/setup-bus.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f10ff08fe82c..e43218a6a3d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5468ae617035f06ae1e07c264d6cdfcd721b539f
+refs/heads/master: a391f19717984a8f70756b29074298f379fcfdbc
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index d4f4c1279ba6..f9b7bdd27829 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/drivers/pci/setup-bus.c
@@ -145,8 +145,7 @@ EXPORT_SYMBOL(pci_setup_cardbus);
    config space writes, so it's quite possible that an I/O window of
    the bridge will have some undesirable address (e.g. 0) after the
    first write. Ditto 64-bit prefetchable MMIO.  */
-static void __devinit
-pci_setup_bridge(struct pci_bus *bus)
+static void pci_setup_bridge(struct pci_bus *bus)
 {
 	struct pci_dev *bridge = bus->self;
 	struct pci_bus_region region;