Changeset cf2af94 in mainline for kernel/generic/include/console/kconsole.h

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• kernel/generic/include/console/kconsole.h (modified) (1 diff)

kernel/generic/include/console/kconsole.h ¶

@@ -62 +62 @@
         size_t len;
         /** Integer value. */
-        unative_t intval;
+        sysarg_t intval;
         /** Resulting type of variable arg */
         cmd_arg_type_t vartype;