From 020bd9f1c766ca743556461a70a5b5d559b7e60c Mon Sep 17 00:00:00 2001 From: Brian Gerst <bgerst@didntduck.org> Date: Mon, 15 Oct 2007 13:57:46 +0200 Subject: x86: trivial header merges Merge 32/64-bit headers that simply redirect to asm-generic [tglx: fixup Kbuild as well] Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/asm-x86/resource.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'include/asm-x86/resource.h') diff --git a/include/asm-x86/resource.h b/include/asm-x86/resource.h index 732410a8c02a..04bc4db8921b 100644 --- a/include/asm-x86/resource.h +++ b/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> -- cgit v1.2.3