[PATCH 1/4] UML - Remove duplicate includes

[Jeff Dike]

[ Andrew, these four patches are 2.6.12 material ]

A few files include the same header twice.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

Index: linux-2.6.12-rc/arch/um/kernel/main.c
===================================================================
--- linux-2.6.12-rc.orig/arch/um/kernel/main.c	2005-06-08 14:33:10.000000000 -0400
+++ linux-2.6.12-rc/arch/um/kernel/main.c	2005-06-08 14:33:36.000000000 -0400
@@ -24,8 +24,6 @@
 #include "mode.h"
 #include "choose-mode.h"
 #include "uml-config.h"
-#include "irq_user.h"
-#include "time_user.h"
 #include "os.h"
 
 /* Set in set_stklim, which is called from main and __wrap_malloc.
Index: linux-2.6.12-rc/arch/um/kernel/process.c
===================================================================
--- linux-2.6.12-rc.orig/arch/um/kernel/process.c	2005-06-08 14:31:54.000000000 -0400
+++ linux-2.6.12-rc/arch/um/kernel/process.c	2005-06-08 14:33:13.000000000 -0400
@@ -30,7 +30,6 @@
 #include "init.h"
 #include "os.h"
 #include "uml-config.h"
-#include "ptrace_user.h"
 #include "choose-mode.h"
 #include "mode.h"
 #ifdef UML_CONFIG_MODE_SKAS
Index: linux-2.6.12-rc/arch/um/kernel/um_arch.c
===================================================================
--- linux-2.6.12-rc.orig/arch/um/kernel/um_arch.c	2005-06-08 14:31:54.000000000 -0400
+++ linux-2.6.12-rc/arch/um/kernel/um_arch.c	2005-06-08 14:33:13.000000000 -0400
@@ -26,7 +26,6 @@
 #include "asm/setup.h"
 #include "ubd_user.h"
 #include "asm/current.h"
-#include "asm/setup.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/