From 222cefe1d4943c51371fe2e7da81a8f539acb949 Mon Sep 17 00:00:00 2001
From: Myron Stowe <myron.stowe@redhat.com>
Date: Mon, 25 Jun 2012 21:32:25 -0600
Subject: [PATCH] --- yaml --- r: 316529 b: refs/heads/master c:
 5d9a19e834815c5d224662d51e4634d14fe0ba54 h: refs/heads/master i:   316527:
 564161410d4784e1602c5ab4bb7ea9572f3252f5 v: v3

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

diff --git a/[refs] b/[refs]
index 161dcaad6d99..3a721970b905 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7477dc291b5618da02e2aee388e3a4815c90906f
+refs/heads/master: 5d9a19e834815c5d224662d51e4634d14fe0ba54
diff --git a/trunk/arch/unicore32/kernel/pci.c b/trunk/arch/unicore32/kernel/pci.c
index 2fc2b1ba825e..46cb6c9de6c9 100644
--- a/trunk/arch/unicore32/kernel/pci.c
+++ b/trunk/arch/unicore32/kernel/pci.c
@@ -296,7 +296,7 @@ static int __init pci_common_init(void)
 }
 subsys_initcall(pci_common_init);
 
-char * __devinit pcibios_setup(char *str)
+char * __init pcibios_setup(char *str)
 {
 	if (!strcmp(str, "debug")) {
 		debug_pci = 1;