From 99e40260aeeecb3b9d1509d77a02980af5c45e83 Mon Sep 17 00:00:00 2001
From: Lucas Woods <woodzy@gmail.com>
Date: Thu, 13 Dec 2007 15:56:06 -0800
Subject: [PATCH] --- yaml --- r: 81132 b: refs/heads/master c:
 05ead01554f876b030f4745b2d58db3e53f76ca9 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/powerpc/kernel/signal_32.c         | 3 +--
 trunk/arch/powerpc/platforms/powermac/setup.c | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a8eff7c03e1a..69bf4f3eb3d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c6199c1551b7acd4f7898f073b40ae565d3b834
+refs/heads/master: 05ead01554f876b030f4745b2d58db3e53f76ca9
diff --git a/trunk/arch/powerpc/kernel/signal_32.c b/trunk/arch/powerpc/kernel/signal_32.c
index 6126bca8b70a..d840bc772fd3 100644
--- a/trunk/arch/powerpc/kernel/signal_32.c
+++ b/trunk/arch/powerpc/kernel/signal_32.c
@@ -24,13 +24,12 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/elf.h>
+#include <linux/ptrace.h>
 #ifdef CONFIG_PPC64
 #include <linux/syscalls.h>
 #include <linux/compat.h>
-#include <linux/ptrace.h>
 #else
 #include <linux/wait.h>
-#include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/tty.h>
diff --git a/trunk/arch/powerpc/platforms/powermac/setup.c b/trunk/arch/powerpc/platforms/powermac/setup.c
index 869ca45cf919..adad4e976381 100644
--- a/trunk/arch/powerpc/platforms/powermac/setup.c
+++ b/trunk/arch/powerpc/platforms/powermac/setup.c
@@ -94,7 +94,6 @@ extern struct machdep_calls pmac_md;
 #define DEFAULT_ROOT_DEVICE Root_SDA1	/* sda1 - slightly silly choice */
 
 #ifdef CONFIG_PPC64
-#include <asm/udbg.h>
 int sccdbg;
 #endif