summaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2013-08-13 15:17:38 -0400
committerChris Metcalf <cmetcalf@tilera.com>2013-09-03 14:53:15 -0400
commit7b770a6a0a8504327224ad891d6862893456290d (patch)
treeae05f896239de275b5c513fb2d4a27bc784d3336 /arch/tile/kernel
parent9a55fed4739d48829af359f575790840cc7e91dd (diff)
downloadlinux-stable-7b770a6a0a8504327224ad891d6862893456290d.tar.gz
linux-stable-7b770a6a0a8504327224ad891d6862893456290d.tar.bz2
linux-stable-7b770a6a0a8504327224ad891d6862893456290d.zip
tile: mark pcibios_init() as __init
It was bombed away because it was previously marked as __devinit, but it should be an __init function. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r--arch/tile/kernel/pci.c2
-rw-r--r--arch/tile/kernel/pci_gx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index af75835d6ed2..b7180e6e900d 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -386,7 +386,7 @@ void pcibios_set_master(struct pci_dev *dev)
}
/* Process any "pci=" kernel boot arguments. */
-char * __init pcibios_setup(char *str)
+char *__init pcibios_setup(char *str)
{
if (!strcmp(str, "off")) {
pci_probe = 0;
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 48438818d696..66ef9db5c2fb 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1060,7 +1060,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
}
/* Process any "pci=" kernel boot arguments. */
-char *pcibios_setup(char *str)
+char *__init pcibios_setup(char *str)
{
if (!strcmp(str, "off")) {
pci_probe = 0;