From 700f98e5863b565e4585e287764be27dd9fc1f05 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Wed, 30 Apr 2008 00:55:13 -0700
Subject: [PATCH] --- yaml --- r: 95303 b: refs/heads/master c:
 ae50884f66fc93aa713feade8f87c03471241275 h: refs/heads/master i:   95301:
 e3644faef6c7518ea930f3d36a4147bc802bf73e   95299:
 19af515ad56943e9f4128ee6709aedb007281c1b   95295:
 147a7423a92bc2f4f2d4f1f18563fd4ff9f28746 v: v3

---
 [refs]                                   | 2 +-
 trunk/include/asm-generic/bitops.h       | 4 ----
 trunk/include/asm-generic/futex.h        | 3 ---
 trunk/include/asm-generic/memory_model.h | 2 --
 trunk/include/asm-generic/page.h         | 2 --
 trunk/include/asm-generic/rtc.h          | 3 ---
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 130c71b62175..9489ced3407c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 735643ee6cc5249bfac07fcad0946a5e7aff4423
+refs/heads/master: ae50884f66fc93aa713feade8f87c03471241275
diff --git a/trunk/include/asm-generic/bitops.h b/trunk/include/asm-generic/bitops.h
index 15e6f253dda4..c9f369c4bd7e 100644
--- a/trunk/include/asm-generic/bitops.h
+++ b/trunk/include/asm-generic/bitops.h
@@ -17,8 +17,6 @@
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/find.h>
 
-#ifdef __KERNEL__
-
 #ifndef _LINUX_BITOPS_H
 #error only <linux/bitops.h> can be included directly
 #endif
@@ -32,6 +30,4 @@
 #include <asm-generic/bitops/ext2-atomic.h>
 #include <asm-generic/bitops/minix.h>
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_BITOPS_H */
diff --git a/trunk/include/asm-generic/futex.h b/trunk/include/asm-generic/futex.h
index 67b60b917d88..3c2344f48136 100644
--- a/trunk/include/asm-generic/futex.h
+++ b/trunk/include/asm-generic/futex.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_GENERIC_FUTEX_H
 #define _ASM_GENERIC_FUTEX_H
 
-#ifdef __KERNEL__
-
 #include <linux/futex.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
@@ -56,4 +54,3 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
 }
 
 #endif
-#endif
diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h
index 52226e14bd7d..ae060c62aff1 100644
--- a/trunk/include/asm-generic/memory_model.h
+++ b/trunk/include/asm-generic/memory_model.h
@@ -1,7 +1,6 @@
 #ifndef __ASM_MEMORY_MODEL_H
 #define __ASM_MEMORY_MODEL_H
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_FLATMEM)
@@ -81,6 +80,5 @@ extern unsigned long page_to_pfn(struct page *page);
 #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
 
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 
 #endif
diff --git a/trunk/include/asm-generic/page.h b/trunk/include/asm-generic/page.h
index a96b5d986b6e..14db733b8e68 100644
--- a/trunk/include/asm-generic/page.h
+++ b/trunk/include/asm-generic/page.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_GENERIC_PAGE_H
 #define _ASM_GENERIC_PAGE_H
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #include <linux/compiler.h>
@@ -21,6 +20,5 @@ static __inline__ __attribute_const__ int get_order(unsigned long size)
 }
 
 #endif	/* __ASSEMBLY__ */
-#endif	/* __KERNEL__ */
 
 #endif	/* _ASM_GENERIC_PAGE_H */
diff --git a/trunk/include/asm-generic/rtc.h b/trunk/include/asm-generic/rtc.h
index dd1bed860e64..be4af0029ac0 100644
--- a/trunk/include/asm-generic/rtc.h
+++ b/trunk/include/asm-generic/rtc.h
@@ -12,8 +12,6 @@
 #ifndef __ASM_RTC_H__
 #define __ASM_RTC_H__
 
-#ifdef __KERNEL__
-
 #include <linux/mc146818rtc.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
@@ -213,5 +211,4 @@ static inline int set_rtc_pll(struct rtc_pll_info *pll)
 	return -EINVAL;
 }
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_RTC_H__ */