Changeset 25696fea in mainline for uspace/drv/bus/usb/usbmouse/main.c

Timestamp:

2011-10-15T20:05:00Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 mainline

File:

• uspace/drv/bus/usb/usbmouse/main.c (modified) (2 diffs)

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

@@ -50 +50 @@
  *
  */
-static int usbmouse_add_device(usb_device_t *dev)
+static int usbmouse_device_add(usb_device_t *dev)
 {
         int rc = usb_mouse_create(dev);
@@ -80 +80 @@
 /** USB mouse driver ops. */
 static usb_driver_ops_t mouse_driver_ops = {
-        .add_device = usbmouse_add_device,
+        .device_add = usbmouse_device_add,
 };