Changeset 6843a9c in mainline for uspace/drv/bus/usb/ohci/Makefile

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

• uspace/drv/bus/usb/ohci/Makefile (modified) (1 diff)

uspace/drv/bus/usb/ohci/Makefile

@@ -50 +50 @@
         ohci_batch.c \
         ohci_endpoint.c \
-        pci.c \
+        res.c \
         root_hub.c \
         hw_struct/endpoint_descriptor.c \