Changeset 1eb272d in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-12T09:14:38Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
94c19b8
Parents:
ee0d8a8 (diff), b9eb93f (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 from usb/development into smekideki

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    ree0d8a8 r1eb272d  
    9090        drv/rootvirt \
    9191        drv/test1 \
    92         drv/test2 \
    93         drv/vhc
     92        drv/test2
    9493
    9594## Networking
    … …  
    118117        DIRS += drv/isa
    119118        DIRS += drv/ns8250
     119        DIRS += drv/uhci
     120        DIRS += drv/usbhub
     121        DIRS += drv/usbkbd
     122        DIRS += drv/vhc
    120123endif
    121124
    … …  
    128131        DIRS += drv/usbhub
    129132        DIRS += drv/usbkbd
     133        DIRS += drv/vhc
    130134endif
    131135
Note: See TracChangeset for help on using the changeset viewer.