diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /arch/x86_64/mm/fault.c | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'arch/x86_64/mm/fault.c')
| -rw-r--r-- | arch/x86_64/mm/fault.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 2f187986f940..13792721037e 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/vt_kern.h> /* For unblank_screen() */ | 23 | #include <linux/vt_kern.h> /* For unblank_screen() */ |
| 24 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kprobes.h> | ||
| 27 | 26 | ||
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 29 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |