linux-vax-kern-commit

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/zorro
In directory usw-pr-cvs1:/tmp/cvs-serv6177/zorro

Modified Files:
	gen-devlist.c names.c proc.c zorro.c zorro.ids 
Log Message:
synch 2.4.15 commit 27 


Index: gen-devlist.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/zorro/gen-devlist.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gen-devlist.c	14 Jan 2001 18:59:54 -0000	1.1.1.1
+++ gen-devlist.c	9 Apr 2002 16:45:52 -0000	1.2
@@ -5,7 +5,7 @@
  *
  *	Based on the PCI version:
  *
- *	(c) 1999--2000 Martin Mares <mj...@su...>
+ *	(c) 1999--2000 Martin Mares <mj...@uc...>
  */
 
 #include <stdio.h>

Index: names.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/zorro/names.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- names.c	14 Jan 2001 18:59:53 -0000	1.1.1.1
+++ names.c	9 Apr 2002 16:45:52 -0000	1.2
@@ -37,9 +37,9 @@
  * real memory.. Parse the same file multiple times
  * to get all the info.
  */
-#define MANUF( manuf, name )		static const char __manufstr_##manuf[] __initdata = name;
+#define MANUF( manuf, name )		static char __manufstr_##manuf[] __initdata = name;
 #define ENDMANUF()
-#define PRODUCT( manuf, prod, name ) 	static const char __prodstr_##manuf##prod[] __initdata = name;
+#define PRODUCT( manuf, prod, name ) 	static char __prodstr_##manuf##prod[] __initdata = name;
 #include "devlist.h"
 
 
@@ -48,7 +48,7 @@
 #define PRODUCT( manuf, prod, name )	{ 0x##prod, 0, __prodstr_##manuf##prod },
 #include "devlist.h"
 
-static const struct zorro_manuf_info __initdata zorro_manuf_list[] = {
+static struct zorro_manuf_info __initdata zorro_manuf_list[] = {
 #define MANUF( manuf, name )		{ 0x##manuf, sizeof(__prods_##manuf) / sizeof(struct zorro_prod_info), __manufstr_##manuf, __prods_##manuf },
 #define ENDMANUF()
 #define PRODUCT( manuf, prod, name )

Index: proc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/zorro/proc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: zorro.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/zorro/zorro.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- zorro.c	14 Jan 2001 18:59:51 -0000	1.1.1.1
+++ zorro.c	9 Apr 2002 16:45:52 -0000	1.2
@@ -173,3 +173,5 @@
 
 EXPORT_SYMBOL(zorro_find_device);
 EXPORT_SYMBOL(zorro_unused_z2ram);
+
+MODULE_LICENSE("GPL");

Index: zorro.ids
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/zorro/zorro.ids,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2