Changeset 92574f4 in mainline for uspace/drv/rootvirt/devices.def

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/drv/rootvirt/devices.def (modified) (2 diffs)

uspace/drv/rootvirt/devices.def

@@ -22 +22 @@
 },
 #endif
+#ifdef CONFIG_RUN_VIRTUAL_USB_HC
 /* Virtual USB host controller. */
 {
@@ -27 +28 @@
         .match_id = "usb&hc=vhc"
 },
+#endif