Changeset af2a76c in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2014-07-13T17:25:15Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7493e7b

Parents:

b8e75319 (diff), 78192cc7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/isa/isa.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -355 +355 @@
 
         /* Get the name part of the rest of the line. */
-        strtok(line, ":");
+        str_tok(line, ":", NULL);
         return line;
 }