Changeset 26e7d6d in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2011-09-19T16:31:00Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/ehci/main.c (moved) (moved from uspace/drv/ehci/main.c ) (1 diff)

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

@@ -101 +101 @@
             "Failed to bind EHCI function: %s.\n",
             str_error(ret));
-        ret = ddf_fun_add_to_class(hc_fun, USB_HC_DDF_CLASS_NAME);
+        ret = ddf_fun_add_to_category(hc_fun, USB_HC_CATEGORY);
         CHECK_RET_RETURN(ret,
             "Failed to add EHCI to HC class: %s.\n",