diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-09 22:56:54 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-09 22:56:54 -0400 |
| commit | 9349b44a459677e270ae19a373c58e5c3edbff04 (patch) | |
| tree | 630d4e337691b959b663b79060360fb725a8396a /arch/mips/txx9 | |
| parent | a7711ba1090a5fa1caa6e07182ac4e8e1c0da695 (diff) | |
| parent | 735bff10c157fdbba2291e10ca3e28a59c7acc1c (diff) | |
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/txx9')
| -rw-r--r-- | arch/mips/txx9/generic/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c index f028e3dc25fb..125db323ab1e 100644 --- a/arch/mips/txx9/generic/pci.c +++ b/arch/mips/txx9/generic/pci.c | |||
| @@ -256,7 +256,7 @@ static irqreturn_t i8259_interrupt(int irq, void *dev_id) | |||
| 256 | return IRQ_HANDLED; | 256 | return IRQ_HANDLED; |
| 257 | } | 257 | } |
| 258 | 258 | ||
| 259 | static int __init | 259 | static int __devinit |
| 260 | txx9_i8259_irq_setup(int irq) | 260 | txx9_i8259_irq_setup(int irq) |
| 261 | { | 261 | { |
| 262 | int err; | 262 | int err; |
| @@ -269,7 +269,7 @@ txx9_i8259_irq_setup(int irq) | |||
| 269 | return err; | 269 | return err; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static void __init quirk_slc90e66_bridge(struct pci_dev *dev) | 272 | static void __devinit quirk_slc90e66_bridge(struct pci_dev *dev) |
| 273 | { | 273 | { |
| 274 | int irq; /* PCI/ISA Bridge interrupt */ | 274 | int irq; /* PCI/ISA Bridge interrupt */ |
| 275 | u8 reg_64; | 275 | u8 reg_64; |