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

Timestamp:

2010-03-21T09:40:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c682dd1

Parents:

4e9aaf5 (diff), 19f857a (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 from dev/misc.

File:

• kernel/arch/ia64/src/drivers/ski.c (modified) (1 diff)

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

@@ -42 +42 @@
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>