Update of /cvsroot/linuxconsole/ruby/linux/drivers/video/aty
In directory usw-pr-cvs1:/tmp/cvs-serv10630/drivers/video/aty
Modified Files:
atyfb_base.c
Log Message:
Synced to 2.4.13
Index: atyfb_base.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/aty/atyfb_base.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- atyfb_base.c 2001/09/09 16:36:34 1.7
+++ atyfb_base.c 2001/10/29 00:11:00 1.8
@@ -52,7 +52,7 @@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/selection.h>
@@ -2521,8 +2521,7 @@
if (!options || !*options)
return 0;
- for (this_opt = strtok(options, ","); this_opt;
- this_opt = strtok(NULL, ",")) {
+ while (this_opt = strsep(&options, ",")) {
if (!strncmp(this_opt, "font:", 5)) {
char *p;
int i;
|
