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

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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:

• kernel/generic/include/console/kconsole.h (modified) (2 diffs)

kernel/generic/include/console/kconsole.h

@@ -47 +47 @@
         ARG_TYPE_INT,
         ARG_TYPE_STRING,
+        /** Optional string */
+        ARG_TYPE_STRING_OPTIONAL,
         /** Variable type - either symbol or string. */
         ARG_TYPE_VAR
@@ -94 +96 @@
 extern void kconsole_notify_init(void);
 extern bool kconsole_check_poll(void);
-extern void kconsole(char *prompt, char *msg, bool kcon);
+extern void kconsole(const char *prompt, const char *msg, bool kcon);
 extern void kconsole_thread(void *data);