summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/quirks.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-18 20:14:10 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-06-18 20:14:10 +0200
commite822a007047fb84cd068bfa35a682015e0fe19b9 (patch)
treeb66b7b149eebbab4db862a0c75eb0c3b25d76493 /arch/x86/kernel/quirks.c
parentMerge branch 'topic/stowe-cap-cleanup' into next (diff)
parentscripts/modpost: check for bad references in .pci.fixups area (diff)
downloadlinux-e822a007047fb84cd068bfa35a682015e0fe19b9.tar.xz
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/x86/kernel/quirks.c')
-rw-r--r--arch/x86/kernel/quirks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 03920a15a632..1b27de563561 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -512,7 +512,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
#if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
/* Set correct numa_node information for AMD NB functions */
-static void __init quirk_amd_nb_node(struct pci_dev *dev)
+static void __devinit quirk_amd_nb_node(struct pci_dev *dev)
{
struct pci_dev *nb_ht;
unsigned int devfn;