Changeset 6843a9c in mainline for uspace/drv/bus/usb/usbflbk/main.c

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/usbflbk/main.c (modified) (1 diff)

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

@@ -93 +93 @@
         return EOK;
 }
+
 /** USB fallback driver ops. */
-static usb_driver_ops_t usbfallback_driver_ops = {
+static const usb_driver_ops_t usbfallback_driver_ops = {
         .device_add = usbfallback_device_add,
+        .device_rem = usbfallback_device_gone,
         .device_gone = usbfallback_device_gone,
 };
 
 /** USB fallback driver. */
-static usb_driver_t usbfallback_driver = {
+static const usb_driver_t usbfallback_driver = {
         .name = NAME,
         .ops = &usbfallback_driver_ops,