Changeset f4d5f90 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-12-15T10:36:34Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9fe4db3
Parents:
d9f8dd13 (diff), 9916841 (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

    rd9f8dd13 rf4d5f90  
    121121        drv/bus/usb/vhc \
    122122        drv/nic/lo \
    123         drv/nic/ne2k
     123        drv/nic/ne2k \
     124        drv/nic/e1k
    124125
    125126ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.