Changeset b800b0e in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2012-10-23T13:16:49Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (1 diff)

uspace/drv/bus/usb/usbmast/main.c

@@ -383 +383 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
 
         return usb_driver_main(&usbmast_driver);