diff options
| author | Borislav Petkov <bp@alien8.de> | 2010-10-25 18:15:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 19:05:13 +0200 |
| commit | 9afd281a152702143961c09b5482a66eeefe5e03 (patch) | |
| tree | 30cbeb1bd96488f0ac9e74f1821891f34109a233 /arch/x86/kernel/acpi/sleep.c | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-9afd281a152702143961c09b5482a66eeefe5e03.tar.xz linux-9afd281a152702143961c09b5482a66eeefe5e03.zip | |
x86-32, mm: Remove duplicated include
Commit b40827fa7268 ("x86-32, mm: Add an initial page table for core
bootstrapping") added an include directive which is needless and is
taken care of by a previous one. Remove it.
Caught-by: Jaswinder Singh Rajput <jaswinderlinux@gmail.com>
Signed-off-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 74a847835bab..69fd72aa5594 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -15,7 +15,6 @@ #ifdef CONFIG_X86_32 #include <asm/pgtable.h> -#include <asm/pgtable_32.h> #endif #include "realmode/wakeup.h" |