diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 22:19:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 22:19:09 (GMT) |
| commit | 869c34f5208adde010065c387354f2ebe4ec3bfc (patch) | |
| tree | 6c427732d93fbb7357b68747bbbc182ba3b1fe9b /arch/x86/include/asm/ce4100.h | |
| parent | 52d3c03675fdbe1965b9b1909072b40ad2f80063 (diff) | |
| parent | 03150171dcf9492a96f57cbb2aef088bafcfcd2e (diff) | |
| download | linux-869c34f5208adde010065c387354f2ebe4ec3bfc.tar.xz | |
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/asm/ce4100.h')
| -rw-r--r-- | arch/x86/include/asm/ce4100.h | 6 |
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 0000000..e656ad8 --- /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 |