diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-07 14:27:33 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-07 14:27:33 -0700 |
| commit | 3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c (patch) | |
| tree | 1d74afd1a97cd1e9f71e07e8a041a2fcee795f62 /arch/x86/kernel | |
| parent | 27e1c8ee0170e80f6426c35d54f3b5cd9dadb25b (diff) | |
| parent | f9726bfd4b14401d294207a70c7c0c4be8a8c6cc (diff) | |
| download | op-kernel-dev-3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c.zip op-kernel-dev-3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c.tar.gz | |
Merge branch 'pci/daniel-numachip' into next
* pci/daniel-numachip:
x86/PCI: Add NumaChip remote PCI support
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/apic_numachip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index a65829a..9c2aa89 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -22,6 +22,7 @@ #include <linux/hardirq.h> #include <linux/delay.h> +#include <asm/numachip/numachip.h> #include <asm/numachip/numachip_csr.h> #include <asm/smp.h> #include <asm/apic.h> @@ -179,6 +180,7 @@ static int __init numachip_system_init(void) return 0; x86_cpuinit.fixup_cpu_id = fixup_cpu_id; + x86_init.pci.arch_init = pci_numachip_init; map_csrs(); |
