Changeset fa9b606 in mainline for uspace/drv/root/root.c

Timestamp:

2010-12-10T16:46:54Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ee0d8a8

Parents:

10096231 (diff), ebb98c5 (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 from development into smekideki

File:

• uspace/drv/root/root.c (modified) (2 diffs)

uspace/drv/root/root.c

@@ -87 +87 @@
 
         int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
-            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;
@@ -104 +105 @@
         
         int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE,
+            NULL);
 
         return res;