diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-20 00:22:47 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-20 00:22:47 -0400 |
commit | bd5f0d1c256fdf286fab358a04e87476e3535075 (patch) | |
tree | 46dc41eed8618d2a3a9717830b5e165ddea17553 | |
parent | 0c99adb0a6dfe292842a8142b48e494d7731f5fe (diff) |
sh: Fix up PCI section mismatch warnings.
Flag pcibios_setup() and pcibios_fixup_bus() as __devinit.
Follows the sh64 change.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/boards/mpc1211/pci.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/ops-sh4.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci-st40.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c index 4ed1a95c6d5..23849f70f13 100644 --- a/arch/sh/boards/mpc1211/pci.c +++ b/arch/sh/boards/mpc1211/pci.c | |||
@@ -187,7 +187,7 @@ char * __devinit pcibios_setup(char *str) | |||
187 | * are examined. | 187 | * are examined. |
188 | */ | 188 | */ |
189 | 189 | ||
190 | void __init pcibios_fixup_bus(struct pci_bus *b) | 190 | void __devinit pcibios_fixup_bus(struct pci_bus *b) |
191 | { | 191 | { |
192 | pci_read_bridge_bases(b); | 192 | pci_read_bridge_bases(b); |
193 | } | 193 | } |
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c index 54232f13e40..710a3b0306e 100644 --- a/arch/sh/drivers/pci/ops-sh4.c +++ b/arch/sh/drivers/pci/ops-sh4.c | |||
@@ -153,7 +153,7 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d) | |||
153 | } | 153 | } |
154 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); | 154 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); |
155 | 155 | ||
156 | char * __init pcibios_setup(char *str) | 156 | char * __devinit pcibios_setup(char *str) |
157 | { | 157 | { |
158 | if (!strcmp(str, "off")) { | 158 | if (!strcmp(str, "off")) { |
159 | pci_probe = 0; | 159 | pci_probe = 0; |
diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c index 543417ff831..1502a14386b 100644 --- a/arch/sh/drivers/pci/pci-st40.c +++ b/arch/sh/drivers/pci/pci-st40.c | |||
@@ -328,7 +328,7 @@ int __init st40pci_init(unsigned memStart, unsigned memSize) | |||
328 | return 1; | 328 | return 1; |
329 | } | 329 | } |
330 | 330 | ||
331 | char * __init pcibios_setup(char *str) | 331 | char * __devinit pcibios_setup(char *str) |
332 | { | 332 | { |
333 | return str; | 333 | return str; |
334 | } | 334 | } |
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index d439336d2e1..ccaba368ac9 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -71,7 +71,7 @@ subsys_initcall(pcibios_init); | |||
71 | * Called after each bus is probed, but before its children | 71 | * Called after each bus is probed, but before its children |
72 | * are examined. | 72 | * are examined. |
73 | */ | 73 | */ |
74 | void __init pcibios_fixup_bus(struct pci_bus *bus) | 74 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) |
75 | { | 75 | { |
76 | pci_read_bridge_bases(bus); | 76 | pci_read_bridge_bases(bus); |
77 | } | 77 | } |