patch-2.4.13 linux/drivers/video/sgivwfb.c

Next file: linux/drivers/video/sis/sis_main.c
Previous file: linux/drivers/video/sa1100fb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.12/linux/drivers/video/sgivwfb.c linux/drivers/video/sgivwfb.c
@@ -862,8 +862,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))
       strcpy(fb_info.fontname, this_opt+5);
   }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)