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

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

diff --git a/[refs] b/[refs]
index b2fc3b6de77c..6e9e2dc7b704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbd4e055fc8f09db82d31a5ff6cec3c083cc97a8
+refs/heads/master: 7f7b5de2c0e10aa35ad9909edb1af9f2aed2f5d0
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 165553360f24..46a475384362 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -875,8 +875,7 @@ EXPORT_SYMBOL(alloc_pci_dev);
  * Read the config data for a PCI device, sanity-check it
  * and fill in the dev structure...
  */
-static struct pci_dev * __devinit
-pci_scan_device(struct pci_bus *bus, int devfn)
+static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
 {
 	struct pci_dev *dev;
 	u32 l;