diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 23:23:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 23:23:46 -0500 |
| commit | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (patch) | |
| tree | ecfc614d514bd5b43a98cf4c62fdd2f47d86e33c /arch/powerpc/kernel/smp.c | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
| parent | 76c8e25b905f99be5ddbe999597ba7c2c33ec64b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 1794a694a928..5c330c3366e4 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <asm/prom.h> | 40 | #include <asm/prom.h> |
| 41 | #include <asm/smp.h> | 41 | #include <asm/smp.h> |
| 42 | #include <asm/time.h> | 42 | #include <asm/time.h> |
| 43 | #include <asm/xmon.h> | ||
| 44 | #include <asm/machdep.h> | 43 | #include <asm/machdep.h> |
| 45 | #include <asm/cputable.h> | 44 | #include <asm/cputable.h> |
| 46 | #include <asm/system.h> | 45 | #include <asm/system.h> |