Changeset bee37cf in mainline for kernel/generic/include/console/chardev.h

Timestamp:

2011-07-05T21:21:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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/chardev.h (modified) (2 diffs)

kernel/generic/include/console/chardev.h

@@ -73 +73 @@
 typedef struct {
         /** Write character to output. */
-        void (* write)(struct outdev *, wchar_t, bool);
+        void (* write)(struct outdev *, wchar_t);
         
         /** Redraw any previously cached characters. */
@@ -88 +88 @@
         /** Fields suitable for multiplexing. */
         link_t link;
-        link_t list;
+        list_t list;
         
         /** Implementation of outdev operations. */