diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
| commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
| tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /arch/i386/kernel/process.c | |
| parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
| parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) | |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
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> |