summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-07-09 15:36:27 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-07-09 20:56:45 -0600
commit02d4b36bf0022a17f20c3a79b3d94a14dbd6da3a (patch)
tree50fc996abeb5b106f3456213058d6c98444a21b9 /arch/mips/txx9
parent25e742b27018abce3bad42e6b6732f91d71cc655 (diff)
downloadop-kernel-dev-02d4b36bf0022a17f20c3a79b3d94a14dbd6da3a.zip
op-kernel-dev-02d4b36bf0022a17f20c3a79b3d94a14dbd6da3a.tar.gz
MIPS/PCI: move final fixups from __init to __devinit
Final fixups are executed during device enumeration. If we support hotplug, this may be after boot, so final fixups cannot be __init. [bhelgaas: changelog] Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/mips/txx9')
-rw-r--r--arch/mips/txx9/generic/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 682efb0..ce1ee50 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)
return IRQ_HANDLED;
}
-static int __init
+static int __devinit
txx9_i8259_irq_setup(int irq)
{
int err;
@@ -269,7 +269,7 @@ txx9_i8259_irq_setup(int irq)
return err;
}
-static void __init quirk_slc90e66_bridge(struct pci_dev *dev)
+static void __devinit quirk_slc90e66_bridge(struct pci_dev *dev)
{
int irq; /* PCI/ISA Bridge interrupt */
u8 reg_64;
OpenPOWER on IntegriCloud