diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 12:22:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 12:22:27 -0500 |
| commit | 9b80b11c3faa460cf42904a1e368bf2cd075aff6 (patch) | |
| tree | ecc349bbb90856c97be1b93cc9595ceea82fe2c5 /arch/powerpc/kernel/traps.c | |
| parent | b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (diff) | |
| parent | 271c3f35bd36613513e2c2cc90dc914a84df116e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 2020bb7648..1511454c46 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #ifdef CONFIG_PPC64 | 49 | #ifdef CONFIG_PPC64 |
| 50 | #include <asm/firmware.h> | 50 | #include <asm/firmware.h> |
| 51 | #include <asm/processor.h> | 51 | #include <asm/processor.h> |
| 52 | #include <asm/systemcfg.h> | ||
| 53 | #endif | 52 | #endif |
| 54 | 53 | ||
| 55 | #ifdef CONFIG_PPC64 /* XXX */ | 54 | #ifdef CONFIG_PPC64 /* XXX */ |