aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/pcic.c4
-rw-r--r--arch/sparc64/kernel/pci.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 3fa5f95c4614..1c927c538b8b 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -601,7 +601,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
601/* 601/*
602 * Normally called from {do_}pci_scan_bus... 602 * Normally called from {do_}pci_scan_bus...
603 */ 603 */
604void __init pcibios_fixup_bus(struct pci_bus *bus) 604void __devinit pcibios_fixup_bus(struct pci_bus *bus)
605{ 605{
606 struct pci_dev *dev; 606 struct pci_dev *dev;
607 int i, has_io, has_mem; 607 int i, has_io, has_mem;
@@ -842,7 +842,7 @@ static void watchdog_reset() {
842/* 842/*
843 * Other archs parse arguments here. 843 * Other archs parse arguments here.
844 */ 844 */
845char * __init pcibios_setup(char *str) 845char * __devinit pcibios_setup(char *str)
846{ 846{
847 return str; 847 return str;
848} 848}
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 196b4b72482b..12109886bb1e 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -327,7 +327,7 @@ static int __init pcibios_init(void)
327 327
328subsys_initcall(pcibios_init); 328subsys_initcall(pcibios_init);
329 329
330void pcibios_fixup_bus(struct pci_bus *pbus) 330void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
331{ 331{
332 struct pci_pbm_info *pbm = pbus->sysdata; 332 struct pci_pbm_info *pbm = pbus->sysdata;
333 333
@@ -405,7 +405,7 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
405} 405}
406EXPORT_SYMBOL(pcibios_bus_to_resource); 406EXPORT_SYMBOL(pcibios_bus_to_resource);
407 407
408char * __init pcibios_setup(char *str) 408char * __devinit pcibios_setup(char *str)
409{ 409{
410 return str; 410 return str;
411} 411}