Changeset 903bac0a in mainline for uspace/drv/bus/usb/usbmouse/init.c

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/usbmouse/init.c (modified) (1 diff)

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

@@ -116 +116 @@
         
         /* Add the function to mouse class. */
-        rc = ddf_fun_add_to_class(mouse->mouse_fun, "mouse");
+        rc = ddf_fun_add_to_category(mouse->mouse_fun, "mouse");
         if (rc != EOK)
                 goto leave;