Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/vhc/main.c (moved) (moved from uspace/drv/vhc/main.c ) (2 diffs)

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

@@ -34 +34 @@
  */
 
-#include <devmap.h>
+#include <loc.h>
 #include <async.h>
 #include <unistd.h>
@@ -104 +104 @@
         }
 
-        rc = ddf_fun_add_to_class(hc, USB_HC_DDF_CLASS_NAME);
+        rc = ddf_fun_add_to_category(hc, USB_HC_CATEGORY);
         if (rc != EOK) {
                 usb_log_fatal("Failed to add function to HC class: %s.\n",