Changeset 9d9ffdd in mainline for uspace/Makefile

Timestamp:

2011-03-11T15:42:43Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

0bd4810c

Parents:

60a228f (diff), a8def7d (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 hidd

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -117 +117 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
+                drv/ehci-hcd \
                 drv/uhci-hcd \
                 drv/uhci-rhd \
@@ -122 +123 @@
                 drv/usbhub \
                 drv/usbmid \
+                drv/usbmouse \
                 drv/vhc
 endif
@@ -133 +135 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
+                drv/ehci-hcd \
                 drv/uhci-hcd \
                 drv/uhci-rhd \
@@ -138 +141 @@
                 drv/usbhub \
                 drv/usbmid \
+                drv/usbmouse \
                 drv/vhc
 endif