From: Chris Metcalf Date: Tue, 13 Aug 2013 19:17:38 +0000 (-0400) Subject: tile: mark pcibios_init() as __init X-Git-Tag: next-20130822~108^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4751bdab516caebfb6f5fe457fd47ab52bb1fa5;p=karo-tx-linux.git 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 --- 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;