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


Ignore:
Timestamp:
2011-07-12T03:00:14Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6817eba
Parents:
eca52a8 (diff), 026793d (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/src/ia64.c

    reca52a8 rf51f193  
    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.