[PATCH 11/24] x86/uapi: Use Kbuild logic to include <asm-generic/types.h>

Geert Uytterhoeven
2013-11-25T09:06:44Z

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
---
arch/x86/include/uapi/asm/Kbuild | 3 ++-
arch/x86/include/uapi/asm/types.h | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
delete mode 100644 arch/x86/include/uapi/asm/types.h

diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild
index 09409c44f9a5..42951639fc2c 100644
--- a/arch/x86/include/uapi/asm/Kbuild
+++ b/arch/x86/include/uapi/asm/Kbuild
@@ -1,6 +1,8 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm

+generic-y += types.h
+
genhdr-y += unistd_32.h
genhdr-y += unistd_64.h
genhdr-y += unistd_x32.h
@@ -56,7 +58,6 @@ header-y += svm.h
header-y += swab.h
header-y += termbits.h
header-y += termios.h
-header-y += types.h
header-y += ucontext.h
header-y += unistd.h
header-y += vm86.h
diff --git a/arch/x86/include/uapi/asm/types.h b/arch/x86/include/uapi/asm/types.h
deleted file mode 100644
index 8e8c23fef08c..000000000000
--- a/arch/x86/include/uapi/asm/types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_TYPES_H
-#define _ASM_X86_TYPES_H
-
-#include <asm-generic/types.h>
-
-#endif /* _ASM_X86_TYPES_H */
--
1.7.9.5