Changeset aa85487 in mainline for kernel/arch/ia64/src/cpu/cpu.c

Timestamp:

2010-03-07T15:11:56Z (14 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/arch/ia64/src/cpu/cpu.c (modified) (1 diff)

kernel/arch/ia64/src/cpu/cpu.c

@@ -52 +52 @@
 void cpu_print_report(cpu_t *m)
 {
-        char *family_str;
+        const char *family_str;
         char vendor[2 * sizeof(uint64_t) + 1];