Changeset e4f8c77 in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2011-07-13T22:39:18Z (13 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e6910c8
Parents:
5974661 (diff), 8ecef91 (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 libposix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    r5974661 re4f8c77  
    151151        /* Set platform name. */
    152152#ifdef MACHINE_ski
    153         platform = "pc";
     153        platform = "ski";
    154154#endif
    155155#ifdef MACHINE_i460GX
Note: See TracChangeset for help on using the changeset viewer.