Changeset 92574f4 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/usbinfo/main.c (modified) (2 diffs)

uspace/app/usbinfo/main.c

@@ -43 +43 @@
 #include <devman.h>
 #include <devmap.h>
-#include <usb/usbdrv.h>
 #include "usbinfo.h"
 
@@ -81 +80 @@
 {
         int rc;
+
+        if (str_cmp(path, "uhci") == 0) {
+                path = "/hw/pci0/00:01.2/uhci";
+        }
 
         devman_handle_t handle;