[Gc-linux-cvs] linux/drivers/video gcnfb.c, 1.16, 1.17 gcngx.c, 1.12, 1.13

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

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7117/drivers/video

Modified Files:
	gcnfb.c gcngx.c 
Log Message:
Added powerpc arch.
Tweaked some driver for wii compatibility.


Index: gcnfb.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gcnfb.c	14 Nov 2007 23:08:55 -0000	1.16
+++ gcnfb.c	4 Mar 2008 06:20:56 -0000	1.17
@@ -31,7 +31,13 @@
 #include <linux/wait.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
+
+#ifdef CONFIG_PPC_MERGE
+#include <platforms/embedded6xx/gamecube.h>
+#else
 #include <platforms/gamecube.h>
+#endif
+
 #include "gcngx.h"
 
 #define DRV_MODULE_NAME   "gcnfb"
@@ -47,7 +53,7 @@
 
 #define VI_IRQ	8
 
-#define VI_BASE			0xcc002000
+#define VI_BASE			(GCN_IO1_BASE+0x2000)
 #define VI_SIZE			0x100
 
 #define VI_IO_BASE		((void __iomem *)VI_BASE)

Index: gcngx.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gcngx.c	14 Nov 2007 23:08:56 -0000	1.12
+++ gcngx.c	4 Mar 2008 06:20:56 -0000	1.13
@@ -30,7 +30,13 @@
 #include <asm/pgtable.h>
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
+
+#ifdef CONFIG_PPC_MERGE
+#include <platforms/embedded6xx/gamecube.h>
+#else
 #include <platforms/gamecube.h>
+#endif
+
 #include "gcngx.h"
 
 /* Function definitions */