diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 12:14:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 12:14:10 -0600 |
| commit | e822a007047fb84cd068bfa35a682015e0fe19b9 (patch) | |
| tree | b66b7b149eebbab4db862a0c75eb0c3b25d76493 /arch/frv | |
| parent | 47fcb6da65e9e74f71f4ec68f1245fc600bec711 (diff) | |
| parent | bb15d8db7cce766b62cab624120916d25e94ac7a (diff) | |
| download | talos-op-linux-e822a007047fb84cd068bfa35a682015e0fe19b9.tar.gz talos-op-linux-e822a007047fb84cd068bfa35a682015e0fe19b9.zip | |
Merge branch 'topic/sebastian-devinit-fixups' into next
* topic/sebastian-devinit-fixups:
scripts/modpost: check for bad references in .pci.fixups area
sh/PCI: move fixup hooks from __init to __devinit
powerpc/PCI: move fixup hooks from __init to __devinit
frv/PCI: move fixup hooks from __init to __devinit
arm/PCI: move fixup hooks from __init to __devinit
alpha/PCI: move fixup hooks from __init to __devinit
PCI: move fixup hooks from __init to __devinit
x86/PCI: move fixup hooks from __init to __devinit
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-vdk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index 6b0b82ff4419..d04ed14bbf0c 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c @@ -268,7 +268,7 @@ static void __init pci_fixup_umc_ide(struct pci_dev *d) d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; } -static void __init pci_fixup_ide_bases(struct pci_dev *d) +static void __devinit pci_fixup_ide_bases(struct pci_dev *d) { int i; @@ -287,7 +287,7 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d) } } -static void __init pci_fixup_ide_trash(struct pci_dev *d) +static void __devinit pci_fixup_ide_trash(struct pci_dev *d) { int i; |
