From c1553c74390965cb8f2dee586a71c6dd7d901244 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 20 Dec 2005 18:43:52 +1100
Subject: [PATCH] --- yaml --- r: 17212 b: refs/heads/master c:
 42650d8c9060a2658a79d4e30a5790b23d7753e0 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-powerpc/heathrow.h | 2 +-
 trunk/include/asm-powerpc/ohare.h    | 2 +-
 trunk/include/asm-powerpc/seccomp.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 524b8faabfd7..11d4d1046590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88ced0314938814e1772b4d0d7ab20c52e4472b6
+refs/heads/master: 42650d8c9060a2658a79d4e30a5790b23d7753e0
diff --git a/trunk/include/asm-powerpc/heathrow.h b/trunk/include/asm-powerpc/heathrow.h
index 470ab7be20a2..93f54958a9d1 100644
--- a/trunk/include/asm-powerpc/heathrow.h
+++ b/trunk/include/asm-powerpc/heathrow.h
@@ -1,6 +1,6 @@
 #ifndef _ASM_POWERPC_HEATHROW_H
 #define _ASM_POWERPC_HEATHROW_H
-#ifndef __KERNEL__
+#ifdef __KERNEL__
 /*
  * heathrow.h: definitions for using the "Heathrow" I/O controller chip.
  *
diff --git a/trunk/include/asm-powerpc/ohare.h b/trunk/include/asm-powerpc/ohare.h
index b42037cf4ad0..0d030f9dea24 100644
--- a/trunk/include/asm-powerpc/ohare.h
+++ b/trunk/include/asm-powerpc/ohare.h
@@ -1,6 +1,6 @@
 #ifndef _ASM_POWERPC_OHARE_H
 #define _ASM_POWERPC_OHARE_H
-#ifndef __KERNEL__
+#ifdef __KERNEL__
 /*
  * ohare.h: definitions for using the "O'Hare" I/O controller chip.
  *
diff --git a/trunk/include/asm-powerpc/seccomp.h b/trunk/include/asm-powerpc/seccomp.h
index cc8137b77b90..853765eb1f65 100644
--- a/trunk/include/asm-powerpc/seccomp.h
+++ b/trunk/include/asm-powerpc/seccomp.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_POWERPC_SECCOMP_H
 #define _ASM_POWERPC_SECCOMP_H
 
-#ifndef __KERNEL__
+#ifdef __KERNEL__
 #include <linux/thread_info.h>
 #endif