Changeset 903bac0a in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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 changes.

File:

• uspace/srv/bd/ata_bd/ata_bd.h (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.h

@@ -116 +116 @@
 
         fibril_mutex_t lock;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
 } disk_t;