Changeset d1e196f7 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-08-21T12:04:27Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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/src/console/console.c (modified) (1 diff)

kernel/generic/src/console/console.c

@@ -248 +248 @@
 }
 
-void klog_update(void *e)
+void klog_update(void *event)
 {
         if (!atomic_get(&klog_inited))