Changeset f2962621 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• uspace/srv/vfs/vfs.h (modified) (1 diff)

uspace/srv/vfs/vfs.h

@@ -54 +54 @@
         fs_handle_t fs_handle;
         fibril_mutex_t phone_lock;
-        ipcarg_t phone;
+        sysarg_t phone;
 } fs_info_t;