Changeset 44b1674 in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2011-04-18T21:48:55Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (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 form usb/development

File:

• uspace/lib/drv/generic/dev_iface.c (modified) (2 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -43 +43 @@
 #include "remote_usb.h"
 #include "remote_usbhc.h"
+#include "remote_usbhid.h"
 #include "remote_pci.h"
 
@@ -51 +52 @@
                 &remote_pci_iface,
                 &remote_usb_iface,
-                &remote_usbhc_iface
+                &remote_usbhc_iface,
+                &remote_usbhid_iface
         }
 };