[Gc-linux-cvs] linux/arch/ppc/boot/simple embed_config.c, 1.10, 1.11 head.S, 1.10, 1.11 misc-embedded.c, 1.7, 1.8

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/arch/ppc/boot/simple

Modified Files:
	embed_config.c head.S misc-embedded.c 
Log Message:
Merged 2.6.18.


Index: head.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/head.S,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- head.S	21 Jun 2006 18:56:05 -0000	1.10
+++ head.S	17 Feb 2007 23:43:40 -0000	1.11
@@ -11,7 +11,6 @@
  * or implied.
  */
 
-#include <linux/config.h>
 #include <asm/reg.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>

Index: misc-embedded.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- misc-embedded.c	4 Jan 2005 21:39:03 -0000	1.7
+++ misc-embedded.c	17 Feb 2007 23:43:40 -0000	1.8
@@ -6,7 +6,6 @@
  * Currently maintained by: Tom Rini <tr...@ke...>
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <asm/bootinfo.h>

Index: embed_config.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- embed_config.c	21 Jun 2006 18:56:05 -0000	1.10
+++ embed_config.c	17 Feb 2007 23:43:40 -0000	1.11
@@ -8,7 +8,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/config.h>
 #include <linux/string.h>
 #include <asm/reg.h>
 #ifdef CONFIG_8xx