[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1500 setup.c,1.4,1.5

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500
In directory usw-pr-cvs1:/tmp/cvs-serv1301/arch/mips/au1000/pb1500

Modified Files:
	setup.c 
Log Message:
Some changes to Au1000 sound driver:
-  Added mutex locks around read/write methods, to prevent
   simultaneous access on SMP or preemptible kernels.
-  Removed the counter/pointer fragment aligning at the end
   of read/write methods, for madplay.
-  Use coherent DMA.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1500/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	23 Mar 2002 02:13:01 -0000	1.4
+++ setup.c	25 Mar 2002 22:58:15 -0000	1.5
@@ -207,7 +207,12 @@
 #ifdef CONFIG_FB_E1356
 	if ((argptr = strstr(argptr, "video=")) == NULL) {
 		argptr = prom_getcmdline();
-		strcat(argptr, " video=e1356fb:system:pb1500,mmunalign:1");
+		strcat(argptr, " video=e1356fb:system:pb1500");
+	}
+#elif defined (CONFIG_FB_XPERT98)
+	if ((argptr = strstr(argptr, "video=")) == NULL) {
+		argptr = prom_getcmdline();
+		strcat(argptr, " video=atyfb:1024x768-8@70");
 	}
 #endif // CONFIG_FB_E1356