From e55dade72090eaebca6b0022d85051aa9d7b9591 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:37:14 +0000
Subject: [PATCH] --- yaml --- r: 119321 b: refs/heads/master c:
 ad04d31e5fb6b25308e6cdea6baa07d41871a3e0 h: refs/heads/master i:   119319:
 833f01f35016b825b585401f63c56eb68d438d0a v: v3

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

diff --git a/[refs] b/[refs]
index e1c3fbc07b5a..35529b8cd1ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bcc17dd8e48b612d43a9b0a6faa9eaa358fa4bd
+refs/heads/master: ad04d31e5fb6b25308e6cdea6baa07d41871a3e0
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 28af496b441e..061d1ee0046a 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2042,7 +2042,7 @@ static int __devinit pci_init(void)
 	return 0;
 }
 
-static int __devinit pci_setup(char *str)
+static int __init pci_setup(char *str)
 {
 	while (str) {
 		char *k = strchr(str, ',');