diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-10 02:56:54 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-10 02:56:54 (GMT) |
commit | 9349b44a459677e270ae19a373c58e5c3edbff04 (patch) | |
tree | 630d4e337691b959b663b79060360fb725a8396a /arch/mips/pci | |
parent | a7711ba1090a5fa1caa6e07182ac4e8e1c0da695 (diff) | |
parent | 735bff10c157fdbba2291e10ca3e28a59c7acc1c (diff) | |
download | linux-9349b44a459677e270ae19a373c58e5c3edbff04.tar.xz |
Merge branch 'pci/myron-final-fixups-v2' into next
* pci/myron-final-fixups-v2:
PCI: call final fixups hot-added devices
PCI: move final fixups from __init to __devinit
x86/PCI: move final fixups from __init to __devinit
MIPS/PCI: move final fixups from __init to __devinit
PCI: never discard enable/suspend/resume_early/resume fixups
PCI: release temporary reference in __nv_msi_ht_cap_quirk()
PCI: restructure 'pci_do_fixups()'
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/ops-tx4927.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index a1e7e6d..bc13e29 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c @@ -495,7 +495,7 @@ irqreturn_t tx4927_pcierr_interrupt(int irq, void *dev_id) } #ifdef CONFIG_TOSHIBA_FPCIB0 -static void __init tx4927_quirk_slc90e66_bridge(struct pci_dev *dev) +static void __devinit tx4927_quirk_slc90e66_bridge(struct pci_dev *dev) { struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(dev->bus); |