[Gc-linux-cvs] linux/drivers/exi exi-driver.c,1.15,1.16

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

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

Modified Files:
	exi-driver.c 
Log Message:
Small cleanups:
- Added copyright notices to the DTS files.
- Renamed DTS node names and compatible properties as per segher suggestion.
- s/-isobel/i/ from version strings.
- Added missing arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h file.
- s/DVD/Disk/ on gcn-di.c.
- Use "exi" instead of "exi-driver" in exi-driver messages.



Index: exi-driver.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-driver.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exi-driver.c	26 Mar 2008 20:15:11 -0000	1.15
+++ exi-driver.c	27 Mar 2008 22:35:37 -0000	1.16
@@ -21,13 +21,13 @@
 #include <linux/module.h>
 #include <linux/of_platform.h>
 
-#define DRV_MODULE_NAME	"exi-driver"
+#define DRV_MODULE_NAME	"exi"
 #define DRV_DESCRIPTION	"Nintendo GameCube EXternal Interface (EXI) driver"
 #define DRV_AUTHOR	"Arthur Othieno <a.o...@bl...>, " \
 			"Todd Jeffreys <to...@vo...>, " \
 			"Albert Herranz"
 
-static char exi_driver_version[] = "4.0-isobel";
+static char exi_driver_version[] = "4.0i";
 
 #define drv_printk(level, format, arg...) \
 	printk(level DRV_MODULE_NAME ": " format , ## arg)
@@ -493,9 +493,13 @@
         drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION,
 		   exi_driver_version);
 
-	np = of_find_compatible_node(NULL, NULL, "nintendo,exi");
-	if (!np)
-		return -ENODEV;
+	np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-exi");
+	if (!np) {
+		np = of_find_compatible_node(NULL, NULL,
+					     "nintendo,hollywood-exi");
+		if (!np)
+			return -ENODEV;
+	}
 
 	retval = of_address_to_resource(np, 0, &res);
 	if (retval) {