Changeset e285656 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-12-14T20:45:49Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0cfb05e
Parents:
d6d15ec (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:

Mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    rd6d15ec re285656  
    119119        drv/bus/usb/vhc \
    120120        drv/nic/lo \
    121         drv/nic/ne2k
     121        drv/nic/ne2k \
     122        drv/nic/e1k
    122123
    123124ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.