Changeset aa85487 in mainline for kernel/arch/ia32/src/mm/frame.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/arch/ia32/src/mm/frame.c (modified) (3 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32mm  
+/** @addtogroup ia32mm
  * @{
  */
@@ -109 +109 @@
 }
 
-static char *e820names[] = {
+static const char *e820names[] = {
         "invalid",
         "available",
@@ -122 +122 @@
 {
         unsigned int i;
-        char *name;
+        const char *name;
         
         printf("Base               Size               Name\n");