aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-14 15:19:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-14 15:19:09 -0700
commit869c34f5208adde010065c387354f2ebe4ec3bfc (patch)
tree6c427732d93fbb7357b68747bbbc182ba3b1fe9b /arch/x86/include
parent52d3c03675fdbe1965b9b1909072b40ad2f80063 (diff)
parent03150171dcf9492a96f57cbb2aef088bafcfcd2e (diff)
downloadlinux-linaro-android-869c34f5208adde010065c387354f2ebe4ec3bfc.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: ce4100: Set pci ops via callback instead of module init x86/mm: Fix pgd_lock deadlock x86/mm: Handle mm_fault_error() in kernel space x86: Don't check for BIOS corruption in first 64K when there's no need to
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/ce4100.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/ce4100.h b/arch/x86/include/asm/ce4100.h
new file mode 100644
index 00000000000..e656ad8c0a2
--- /dev/null
+++ b/arch/x86/include/asm/ce4100.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_CE4100_H_
+#define _ASM_CE4100_H_
+
+int ce4100_pci_init(void);
+
+#endif