Changeset 5e2aa83 in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2011-07-05T21:28:25Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ff65e91
Parents:
f7a55f9 (diff), bee37cf (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 from lp:~jakub/helenos/ia64-revival.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rf7a55f9 r5e2aa83  
    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.