---

yaml --- r: 71026 b: refs/heads/master c: 020bd9f h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 3124a92 · 3124a92
1 parent 2f45681
commit 3124a92
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 116 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c65916fe3586521932fbd1b734f39744657f2f0d
+refs/heads/master: 020bd9f1c766ca743556461a70a5b5d559b7e60c
diff --git a/trunk/include/asm-x86/Kbuild b/trunk/include/asm-x86/Kbuild
@@ -22,8 +22,6 @@ unifdef-y += byteorder_32.h
 unifdef-y += byteorder_64.h
 unifdef-y += elf_32.h
 unifdef-y += elf_64.h
-unifdef-y += errno_32.h
-unifdef-y += errno_64.h
 unifdef-y += ioctls_32.h
 unifdef-y += ioctls_64.h
 unifdef-y += ipcbuf_32.h
@@ -47,8 +45,6 @@ unifdef-y += posix_types_32.h
 unifdef-y += posix_types_64.h
 unifdef-y += ptrace_32.h
 unifdef-y += ptrace_64.h
-unifdef-y += resource_32.h
-unifdef-y += resource_64.h
 unifdef-y += sembuf_32.h
 unifdef-y += sembuf_64.h
 unifdef-y += setup_32.h

diff --git a/trunk/include/asm-x86/cputime.h b/trunk/include/asm-x86/cputime.h
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "cputime_32.h"
-#else
-# include "cputime_64.h"
-#endif
+#include <asm-generic/cputime.h>
diff --git a/trunk/include/asm-x86/cputime_32.h b/trunk/include/asm-x86/cputime_32.h
diff --git a/trunk/include/asm-x86/cputime_64.h b/trunk/include/asm-x86/cputime_64.h
diff --git a/trunk/include/asm-x86/errno.h b/trunk/include/asm-x86/errno.h
@@ -1,13 +1 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "errno_32.h"
-# else
-#  include "errno_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "errno_32.h"
-# else
-#  include "errno_64.h"
-# endif
-#endif
+#include <asm-generic/errno.h>
diff --git a/trunk/include/asm-x86/errno_32.h b/trunk/include/asm-x86/errno_32.h
diff --git a/trunk/include/asm-x86/errno_64.h b/trunk/include/asm-x86/errno_64.h
diff --git a/trunk/include/asm-x86/resource.h b/trunk/include/asm-x86/resource.h
@@ -1,13 +1 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "resource_32.h"
-# else
-#  include "resource_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "resource_32.h"
-# else
-#  include "resource_64.h"
-# endif
-#endif
+#include <asm-generic/resource.h>
diff --git a/trunk/include/asm-x86/resource_32.h b/trunk/include/asm-x86/resource_32.h
diff --git a/trunk/include/asm-x86/resource_64.h b/trunk/include/asm-x86/resource_64.h
diff --git a/trunk/include/asm-x86/rtc.h b/trunk/include/asm-x86/rtc.h
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "rtc_32.h"
-#else
-# include "rtc_64.h"
-#endif
+#include <asm-generic/rtc.h>
diff --git a/trunk/include/asm-x86/rtc_32.h b/trunk/include/asm-x86/rtc_32.h
diff --git a/trunk/include/asm-x86/rtc_64.h b/trunk/include/asm-x86/rtc_64.h
diff --git a/trunk/include/asm-x86/sections.h b/trunk/include/asm-x86/sections.h
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "sections_32.h"
-#else
-# include "sections_64.h"
-#endif
+#include <asm-generic/sections.h>
diff --git a/trunk/include/asm-x86/sections_32.h b/trunk/include/asm-x86/sections_32.h
diff --git a/trunk/include/asm-x86/sections_64.h b/trunk/include/asm-x86/sections_64.h