diff options
author | Lucas Woods <woodzy@gmail.com> | 2007-12-13 18:56:06 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 01:13:50 -0500 |
commit | 05ead01554f876b030f4745b2d58db3e53f76ca9 (patch) | |
tree | 388b02e371df27bd169dfc408d545df3fcc74272 /arch | |
parent | 6c6199c1551b7acd4f7898f073b40ae565d3b834 (diff) |
[POWERPC] arch/powerpc: Remove duplicate includes
Signed-off-by: Lucas Woods <woodzy@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/signal_32.c | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 6126bca8b70a..d840bc772fd3 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
@@ -24,13 +24,12 @@ | |||
24 | #include <linux/signal.h> | 24 | #include <linux/signal.h> |
25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
26 | #include <linux/elf.h> | 26 | #include <linux/elf.h> |
27 | #include <linux/ptrace.h> | ||
27 | #ifdef CONFIG_PPC64 | 28 | #ifdef CONFIG_PPC64 |
28 | #include <linux/syscalls.h> | 29 | #include <linux/syscalls.h> |
29 | #include <linux/compat.h> | 30 | #include <linux/compat.h> |
30 | #include <linux/ptrace.h> | ||
31 | #else | 31 | #else |
32 | #include <linux/wait.h> | 32 | #include <linux/wait.h> |
33 | #include <linux/ptrace.h> | ||
34 | #include <linux/unistd.h> | 33 | #include <linux/unistd.h> |
35 | #include <linux/stddef.h> | 34 | #include <linux/stddef.h> |
36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 869ca45cf919..adad4e976381 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -94,7 +94,6 @@ extern struct machdep_calls pmac_md; | |||
94 | #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */ | 94 | #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */ |
95 | 95 | ||
96 | #ifdef CONFIG_PPC64 | 96 | #ifdef CONFIG_PPC64 |
97 | #include <asm/udbg.h> | ||
98 | int sccdbg; | 97 | int sccdbg; |
99 | #endif | 98 | #endif |
100 | 99 | ||