Changeset 92574f4 in mainline for uspace/lib/fs/libfs.h

Timestamp:

2011-02-24T12:03:27Z (13 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/lib/fs/libfs.h (modified) (2 diffs)

uspace/lib/fs/libfs.h

@@ -39 +39 @@
 #include <ipc/vfs.h>
 #include <stdint.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <devmap.h>
@@ -86 +85 @@
 typedef struct {
         int fs_handle;           /**< File system handle. */
-        sysarg_t vfs_phonehash;  /**< Initial VFS phonehash. */
         uint8_t *plb_ro;         /**< Read-only PLB view. */
 } fs_reg_t;