Changeset aa85487 in mainline for kernel/test/sysinfo/sysinfo1.c

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• kernel/test/sysinfo/sysinfo1.c (modified) (1 diff)

kernel/test/sysinfo/sysinfo1.c

@@ -33 +33 @@
 #include <sysinfo/sysinfo.h>
 
-char *test_sysinfo1(void)
+const char *test_sysinfo1(void)
 {
         if (!test_quiet)