Changeset 92574f4 in mainline for uspace/Makefile

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -117 +117 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
-                drv/uhci \
+                drv/uhci-hcd \
+                drv/uhci-rhd \
                 drv/usbhid \
                 drv/usbhub \
+                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/usbmid \
                 drv/vhc
 endif