Changeset 6843a9c in mainline for uspace/drv/bus/usb/ehci/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/ehci/Makefile (modified) (1 diff)

uspace/drv/bus/usb/ehci/Makefile

@@ -42 +42 @@
 
 SOURCES = \
-        hc_iface.c \
         main.c \
-        pci.c
+        res.c
 
 include $(USPACE_PREFIX)/Makefile.common