Changeset 25eec4e in mainline for kernel/generic/include/console/console.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

kernel/generic/include/console/console.h

@@ -67 +67 @@
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern sysarg_t sys_klog(int fd, const void *buf, size_t size);
+extern sysarg_t sys_klog(int cmd, const void *buf, size_t size);
 
 extern void grab_console(void);