diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/i386/kernel/process.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel/process.c')
| -rw-r--r-- | arch/i386/kernel/process.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index b45cbf93d439..7a14fdfd3af9 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c | |||
| @@ -47,13 +47,11 @@ | |||
| 47 | #include <asm/ldt.h> | 47 | #include <asm/ldt.h> |
| 48 | #include <asm/processor.h> | 48 | #include <asm/processor.h> |
| 49 | #include <asm/i387.h> | 49 | #include <asm/i387.h> |
| 50 | #include <asm/irq.h> | ||
| 51 | #include <asm/desc.h> | 50 | #include <asm/desc.h> |
| 52 | #ifdef CONFIG_MATH_EMULATION | 51 | #ifdef CONFIG_MATH_EMULATION |
| 53 | #include <asm/math_emu.h> | 52 | #include <asm/math_emu.h> |
| 54 | #endif | 53 | #endif |
| 55 | 54 | ||
| 56 | #include <linux/irq.h> | ||
| 57 | #include <linux/err.h> | 55 | #include <linux/err.h> |
| 58 | 56 | ||
| 59 | #include <asm/tlbflush.h> | 57 | #include <asm/tlbflush.h> |