[uml-devel] [PATCH 1/4] UML - Remove duplicate includes

[uml-devel] [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@addtoit.com>

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"



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel