From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754769Ab3KYJGo (ORCPT ); Mon, 25 Nov 2013 04:06:44 -0500 Received: from gerard.telenet-ops.be ([195.130.132.48]:39717 "EHLO gerard.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753459Ab3KYIzo (ORCPT ); Mon, 25 Nov 2013 03:55:44 -0500 From: Geert Uytterhoeven To: Arnd Bergmann , linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH 11/24] x86/uapi: Use Kbuild logic to include Date: Mon, 25 Nov 2013 09:55:21 +0100 Message-Id: <1385369734-24893-12-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> References: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Geert Uytterhoeven Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" 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 - -#endif /* _ASM_X86_TYPES_H */ -- 1.7.9.5