Changeset ecf823a in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-12-31T10:01:19Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
96cd5b4
Parents:
3819ce5 (diff), 852052d (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r3819ce5 recf823a  
    122122        drv/nic/lo \
    123123        drv/nic/ne2k \
    124         drv/nic/e1k
     124        drv/nic/e1k \
     125        drv/nic/rtl8139
    125126
    126127ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.