[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-610470ce804f0326ca63fbcdc5be06b750debeb1@git.kernel.org>
Date: Tue, 26 Oct 2010 06:46:35 GMT
From: tip-bot for Borislav Petkov <bp@...en8.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
torvalds@...ux-foundation.org, bp@...en8.de,
jaswinderlinux@...il.com, tglx@...utronix.de, hpa@...ux.intel.com,
mingo@...e.hu
Subject: [tip:x86/urgent] x86-32, mm: Remove duplicated #include
Commit-ID: 610470ce804f0326ca63fbcdc5be06b750debeb1
Gitweb: http://git.kernel.org/tip/610470ce804f0326ca63fbcdc5be06b750debeb1
Author: Borislav Petkov <bp@...en8.de>
AuthorDate: Mon, 25 Oct 2010 18:25:23 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 25 Oct 2010 19:39:33 +0200
x86-32, mm: Remove duplicated #include
b40827fa7268fda8a62490728a61c2856f33830b added an include
directive which is needless and is taken care of by a previous
one. Remove it.
Caught-by: Jaswinder Singh Rajput <jaswinderlinux@...il.com>
Signed-off-by: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Jaswinder Singh Rajput <jaswinderlinux@...il.com>
Cc: H. Peter Anvin <hpa@...ux.intel.com>
LKML-Reference: <20101025162523.GA4712@...tnic>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 74a8478..69fd72a 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"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists