From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:37:04 +0000 (+0000)
Subject: alpha: pcibios_resource_to_bus() is callable from normal code
X-Git-Tag: v2.6.28-rc7~68
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bcc17dd8e48b612d43a9b0a6faa9eaa358fa4bd;p=linux-2.6-omap-h63xx.git

alpha: pcibios_resource_to_bus() is callable from normal code

pci_enable_rom(), specifically.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 5cf45fc5134..ff8cb638472 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp)
 	return PCI_SLOT(dev->devfn);
 }
 
-void __devinit
+void
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
 			 struct resource *res)
 {