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/crash.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/crash.c')
| -rw-r--r-- | arch/i386/kernel/crash.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c index 913be77bb844..0248e084017c 100644 --- a/arch/i386/kernel/crash.c +++ b/arch/i386/kernel/crash.c | |||
| @@ -11,10 +11,8 @@ | |||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | #include <linux/irq.h> | ||
| 15 | #include <linux/reboot.h> | 14 | #include <linux/reboot.h> |
| 16 | #include <linux/kexec.h> | 15 | #include <linux/kexec.h> |
| 17 | #include <linux/irq.h> | ||
| 18 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 19 | #include <linux/elf.h> | 17 | #include <linux/elf.h> |
| 20 | #include <linux/elfcore.h> | 18 | #include <linux/elfcore.h> |