Changeset 8023571 in mainline for kernel/generic/include

Timestamp:

2010-03-21T09:40:37Z (16 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.

Location:

kernel/generic/include

Files:

• str.h (moved) (moved from kernel/generic/include/string.h ) (1 diff)
• sysinfo/sysinfo.h (modified) (1 diff)

kernel/generic/include/str.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_STRING_H_
-#define KERN_STRING_H_
+#ifndef KERN_STR_H_
+#define KERN_STR_H_
 
 #include <typedefs.h>

kernel/generic/include/sysinfo/sysinfo.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <string.h>
+#include <str.h>
 
 extern bool fb_exported;