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


Ignore:
Timestamp:
2012-05-05T08:12:17Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ee04c28
Parents:
2cc7f16 (diff), d21e935c (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

    r2cc7f16 rc6588ce  
    144144#endif
    145145#ifdef MACHINE_i460GX
    146         platform = "i460GX";
     146        platform = "pc";
    147147#endif
    148148        sysinfo_set_item_data("platform", NULL, (void *) platform,
Note: See TracChangeset for help on using the changeset viewer.