Changeset aec2ad4 in mainline for uspace/Makefile

Timestamp:

2011-02-04T11:48:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

103a3626

Parents:

ba5ab09 (diff), 3597dab (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

File:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -46 +46 @@
         app/stats \
         app/taskdump \
-        app/tasks \
         app/tester \
         app/tetris \
@@ -119 +118 @@
                 srv/hw/irc/i8259 \
                 drv/uhci \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
                 drv/vhc
 endif
@@ -133 +132 @@
                 srv/hw/irc/i8259 \
                 drv/uhci \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
                 drv/vhc
 endif