Changeset 4a7a8d4 in mainline for uspace/app/usbinfo/usbinfo.h

Timestamp:

2011-05-13T10:31:54Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (diff), c372e03 (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 with usb/development

File:

• uspace/app/usbinfo/usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/usbinfo.h

@@ -71 +71 @@
 }
 
-usbinfo_device_t *prepare_device(devman_handle_t, usb_address_t);
+usbinfo_device_t *prepare_device(const char *, devman_handle_t, usb_address_t);
 void destroy_device(usbinfo_device_t *);