Changeset 41811af in mainline for uspace/drv/rootvirt/devices.def

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/drv/rootvirt/devices.def (modified) (1 diff)

uspace/drv/rootvirt/devices.def

@@ -21 +21 @@
         .match_id = "virtual&test1"
 },
+{
+        .name = "test3",
+        .match_id = "virtual&test3"
+},
 #endif
+#ifdef CONFIG_RUN_VIRTUAL_USB_HC
+/* Virtual USB host controller. */
+{
+        .name = "usbhc",
+        .match_id = "usb&hc=vhc"
+},
+#endif