diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 18:56:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 18:56:57 +0200 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /arch/x86/boot/memory.c | |
| parent | x86: make sparsemem more available (diff) | |
| parent | forgotten refcount on sysctl root table (diff) | |
| download | linux-616ad8c44281c0c6711a72b560e01ec335ff27e0.tar.xz linux-616ad8c44281c0c6711a72b560e01ec335ff27e0.zip | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'arch/x86/boot/memory.c')
| -rw-r--r-- | arch/x86/boot/memory.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c index 53165c97336b..8c3c25f35578 100644 --- a/arch/x86/boot/memory.c +++ b/arch/x86/boot/memory.c @@ -13,7 +13,6 @@ */ #include "boot.h" -#include <linux/kernel.h> #define SMAP 0x534d4150 /* ASCII "SMAP" */ |