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

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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);