Changeset 19a1800 in mainline for uspace/Makefile

Timestamp:

2011-03-01T22:20:56Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 the current development

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -46 +46 @@
         app/stats \
         app/taskdump \
-        app/tasks \
         app/tester \
         app/tetris \
@@ -53 +52 @@
         app/usbinfo \
         app/virtusbkbd \
+        app/virtusbhub \
         app/netecho \
         app/nettest1 \
@@ -117 +117 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
-                drv/uhci \
+                drv/uhci-hcd \
+                drv/uhci-rhd \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
+                drv/usbmid \
                 drv/vhc
 endif
@@ -131 +133 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
-                drv/uhci \
+                drv/uhci-hcd \
+                drv/uhci-rhd \
+                drv/usbhid \
                 drv/usbhub \
-                drv/usbkbd \
+                drv/usbmid \
                 drv/vhc
 endif