Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9690f36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Resolve PCI section warnings
parents ca45fe8e 46edfc54

arch/arm/kernel/bios32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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,

 * pcibios_fixup_bus - Called after each bus is probed,

 * but before its children are examined.

 * 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_sys_data *root = bus->sysdata;

	struct pci_dev *dev;

	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.

 * 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,

pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			 struct resource *res)

			 struct resource *res)

{

{