summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-12-07 14:27:33 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-12-07 14:27:33 -0700
commit3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c (patch)
tree1d74afd1a97cd1e9f71e07e8a041a2fcee795f62 /arch/x86/include
parent27e1c8ee0170e80f6426c35d54f3b5cd9dadb25b (diff)
parentf9726bfd4b14401d294207a70c7c0c4be8a8c6cc (diff)
downloadlinux-3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c.tar.bz2
Merge branch 'pci/daniel-numachip' into next
* pci/daniel-numachip: x86/PCI: Add NumaChip remote PCI support
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/numachip/numachip.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/include/asm/numachip/numachip.h b/arch/x86/include/asm/numachip/numachip.h
new file mode 100644
index 000000000000..1c6f7f6212c1
--- /dev/null
+++ b/arch/x86/include/asm/numachip/numachip.h
@@ -0,0 +1,19 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Numascale NumaConnect-specific header file
+ *
+ * Copyright (C) 2012 Numascale AS. All rights reserved.
+ *
+ * Send feedback to <support@numascale.com>
+ *
+ */
+
+#ifndef _ASM_X86_NUMACHIP_NUMACHIP_H
+#define _ASM_X86_NUMACHIP_NUMACHIP_H
+
+extern int __init pci_numachip_init(void);
+
+#endif /* _ASM_X86_NUMACHIP_NUMACHIP_H */