Changeset 95c675b in mainline for uspace/drv/block/ahci/ahci.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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/block/ahci/ahci.h (modified) (2 diffs)

uspace/drv/block/ahci/ahci.h

@@ -35 +35 @@
 
 #include <async.h>
-#include <devman.h>
 #include <ddf/interrupt.h>
 #include <stdio.h>
@@ -92 +91 @@
         ahci_port_is_t event_pxis;
         
-        /** Block device service id. */
-        service_id_t service_id;
-        
         /** Number of device data blocks. */
         uint64_t blocks;