Changeset 03362fbd in mainline for uspace/drv/bus/usb/vhc/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/drv/bus/usb/vhc/Makefile

@@ -32 +32 @@
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSBHOST_PREFIX)/libusbhost.a \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
         $(LIBUSB_PREFIX)/libusb.a \
-        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
         $(LIBDRV_PREFIX)/libdrv.a