diff options
| author | Brian Gerst <bgerst@didntduck.org> | 2007-10-15 07:57:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:08 -0400 |
| commit | 020bd9f1c766ca743556461a70a5b5d559b7e60c (patch) | |
| tree | 73833b4a886620c0ccfd79ffb3a98a04206eaeb3 /include/asm-x86/resource.h | |
| parent | c65916fe3586521932fbd1b734f39744657f2f0d (diff) | |
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>
Diffstat (limited to 'include/asm-x86/resource.h')
| -rw-r--r-- | include/asm-x86/resource.h | 14 |
1 files changed, 1 insertions, 13 deletions
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 @@ | |||
| 1 | #ifdef __KERNEL__ | #include <asm-generic/resource.h> | |
| 2 | # ifdef CONFIG_X86_32 | ||
| 3 | # include "resource_32.h" | ||
| 4 | # else | ||
| 5 | # include "resource_64.h" | ||
| 6 | # endif | ||
| 7 | #else | ||
| 8 | # ifdef __i386__ | ||
| 9 | # include "resource_32.h" | ||
| 10 | # else | ||
| 11 | # include "resource_64.h" | ||
| 12 | # endif | ||
| 13 | #endif | ||