diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 16:08:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 16:08:22 -0400 |
| commit | f9690f3681c891d37783e1d619fddeb93b68aac4 (patch) | |
| tree | d17f2dc514286618f57ef5d07174717c16bf0797 | |
| parent | ca45fe8ea86f7a1cf11a6d3bf8bba082be4ea341 (diff) | |
| parent | 46edfc54ee2cc60db0f10d982d6b9b7850733ff2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Resolve PCI section warnings
| -rw-r--r-- | arch/arm/kernel/bios32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 240c448ec31c..a2dd930d11ef 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
| @@ -338,7 +338,7 @@ pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root) | |||
| 338 | * pcibios_fixup_bus - Called after each bus is probed, | 338 | * pcibios_fixup_bus - Called after each bus is probed, |
| 339 | * but before its children are examined. | 339 | * but before its children are examined. |
| 340 | */ | 340 | */ |
| 341 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 341 | void pcibios_fixup_bus(struct pci_bus *bus) |
| 342 | { | 342 | { |
| 343 | struct pci_sys_data *root = bus->sysdata; | 343 | struct pci_sys_data *root = bus->sysdata; |
| 344 | struct pci_dev *dev; | 344 | struct pci_dev *dev; |
| @@ -419,7 +419,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
| 419 | /* | 419 | /* |
| 420 | * Convert from Linux-centric to bus-centric addresses for bridge devices. | 420 | * Convert from Linux-centric to bus-centric addresses for bridge devices. |
| 421 | */ | 421 | */ |
| 422 | void __devinit | 422 | void |
| 423 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | 423 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, |
| 424 | struct resource *res) | 424 | struct resource *res) |
| 425 | { | 425 | { |