diff options
| author | Linus Torvalds | 2007-10-01 22:08:22 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-01 22:08:22 +0200 |
| commit | f9690f3681c891d37783e1d619fddeb93b68aac4 (patch) | |
| tree | d17f2dc514286618f57ef5d07174717c16bf0797 | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | [ARM] Resolve PCI section warnings (diff) | |
| download | kernel-qcow2-linux-f9690f3681c891d37783e1d619fddeb93b68aac4.tar.gz kernel-qcow2-linux-f9690f3681c891d37783e1d619fddeb93b68aac4.tar.xz kernel-qcow2-linux-f9690f3681c891d37783e1d619fddeb93b68aac4.zip | |
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) * pcibios_fixup_bus - Called after each bus is probed, * but before its children are examined. */ -void __devinit pcibios_fixup_bus(struct pci_bus *bus) +void pcibios_fixup_bus(struct pci_bus *bus) { struct pci_sys_data *root = bus->sysdata; struct pci_dev *dev; @@ -419,7 +419,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) /* * Convert from Linux-centric to bus-centric addresses for bridge devices. */ -void __devinit +void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res) { |