From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 12:30:19 +0000 (+0100)
Subject: x86: remove duplicate start_kernel declaration
X-Git-Tag: v2.6.25-rc1~1143^2~819
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf76e8b93dd5e7a53e2cd6db53f3ca18ca0fe4c;p=linux-2.6

x86: remove duplicate start_kernel declaration

start_kernel is already declared in a generic header file.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index d156bfbffa..6643f3f994 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/percpu.h>
+#include <linux/start_kernel.h>
 
 #include <asm/processor.h>
 #include <asm/proto.h>
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 4eddf27618..5a45478b5d 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -8,8 +8,6 @@
 struct cpuinfo_x86; 
 struct pt_regs;
 
-extern void start_kernel(void);
-
 extern void early_idt_handler(void);
 
 extern void init_memory_mapping(unsigned long start, unsigned long end);