Changeset 59ecd4a in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2010-04-04T21:41:47Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5db9084
Parents:
36a75a2 (diff), ee7e82a9 (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

    r36a75a2 r59ecd4a  
    213213#endif
    214214
    215 #ifdef CONFIG_NETIF_DP8390
    216215        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
    217 #endif
    218216
    219217        sysinfo_set_item_val("ia64_iospace", NULL, true);
Note: See TracChangeset for help on using the changeset viewer.