Changeset 04803bf in mainline for kernel/arch/ia64/src/drivers/ski.c

Timestamp:

2011-03-21T22:00:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/arch/ia64/src/drivers/ski.c (modified) (2 diffs)

kernel/arch/ia64/src/drivers/ski.c

@@ -37 +37 @@
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 
@@ -216 +216 @@
                  * self-sufficient.
                  */
-                sysinfo_set_item_val("fb", NULL, false);
+                sysinfo_set_item_val("fb.kind", NULL, 6);
                 
                 fb_exported = true;