summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/bios32.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-18 12:14:10 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-06-18 12:14:10 -0600
commite822a007047fb84cd068bfa35a682015e0fe19b9 (patch)
treeb66b7b149eebbab4db862a0c75eb0c3b25d76493 /arch/arm/kernel/bios32.c
parent47fcb6da65e9e74f71f4ec68f1245fc600bec711 (diff)
parentbb15d8db7cce766b62cab624120916d25e94ac7a (diff)
downloadlinux-e822a007047fb84cd068bfa35a682015e0fe19b9.tar.bz2
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/arm/kernel/bios32.c')
-rw-r--r--arch/arm/kernel/bios32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index f07710849b58..2b2f25e7fef5 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -253,7 +253,7 @@ static void __devinit pci_fixup_cy82c693(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693);
-static void __init pci_fixup_it8152(struct pci_dev *dev)
+static void __devinit pci_fixup_it8152(struct pci_dev *dev)
{
int i;
/* fixup for ITE 8152 devices */