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, ',');