git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
bios32.c
diff --git
a/arch/arm/kernel/bios32.c
b/arch/arm/kernel/bios32.c
index 240c448ec31cf15a40222d2ab8e9414fc65bf7b6..a2dd930d11efd5d9ee8f1f691a101e09c591f07e 100644
(file)
--- 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.
*/
* 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;
{
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.
*/
/*
* 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)
{
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
struct resource *res)
{