diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 08:16:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 08:16:57 -0800 |
commit | 7e4e574c391cdeef516411eb698ac6955f01d673 (patch) | |
tree | e9f3b05c464b82be608cef1a90688dd3719e1537 /arch/powerpc/kernel/crash.c | |
parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
parent | 97b1b999748d3cde6a3f381e0839e0f1082323e6 (diff) | |
download | blackbird-obmc-linux-7e4e574c391cdeef516411eb698ac6955f01d673.tar.gz blackbird-obmc-linux-7e4e574c391cdeef516411eb698ac6955f01d673.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/crash.c')
-rw-r--r-- | arch/powerpc/kernel/crash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 4681155121ef..5f248e3fdf82 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -18,7 +18,6 @@ #include <linux/kexec.h> #include <linux/bootmem.h> #include <linux/crash_dump.h> -#include <linux/irq.h> #include <linux/delay.h> #include <linux/elf.h> #include <linux/elfcore.h> @@ -30,6 +29,7 @@ #include <asm/kdump.h> #include <asm/lmb.h> #include <asm/firmware.h> +#include <asm/smp.h> #ifdef DEBUG #include <asm/udbg.h> |