[Gc-linux-cvs] linux/arch/ppc/platforms Makefile,1.20,1.21 gcn-con.c,1.4,1.5

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

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10066/arch/ppc/platforms

Modified Files:
	Makefile gcn-con.c 
Log Message:
Linux 2.6.15.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile	31 Oct 2005 00:31:02 -0000	1.20
+++ Makefile	18 Jan 2006 23:41:52 -0000	1.21
@@ -14,6 +14,9 @@
 					pmac_low_i2c.o pmac_cache.o
 obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
 					chrp_pegasos_eth.o
+ifeq ($(CONFIG_PPC_CHRP),y)
+obj-$(CONFIG_NVRAM)		+= chrp_nvram.o
+endif
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
 ifeq ($(CONFIG_PPC_PMAC),y)
 obj-$(CONFIG_NVRAM)		+= pmac_nvram.o

Index: gcn-con.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-con.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gcn-con.c	10 Nov 2005 23:29:42 -0000	1.4
+++ gcn-con.c	18 Jan 2006 23:41:52 -0000	1.5
@@ -17,6 +17,7 @@
 #include <linux/console.h>
 #include <linux/font.h>
 #include <linux/cache.h>
+#include <asm/cacheflush.h>
 
 #include "gamecube.h"