diff --git a/[refs] b/[refs]
index 3a721970b905..8b38c3e3746b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d9a19e834815c5d224662d51e4634d14fe0ba54
+refs/heads/master: 15fa325bebbe11184a051ed64965164fca8c1df2
diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c
index 0ad990a20d4a..720e973fc34a 100644
--- a/trunk/arch/x86/pci/common.c
+++ b/trunk/arch/x86/pci/common.c
@@ -494,7 +494,7 @@ int __init pcibios_init(void)
 	return 0;
 }
 
-char * __devinit  pcibios_setup(char *str)
+char * __init pcibios_setup(char *str)
 {
 	if (!strcmp(str, "off")) {
 		pci_probe = 0;