Changeset efdfebc in mainline for uspace/lib/nic/include/nic.h

Timestamp:

2012-11-06T21:03:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/lib/nic/include/nic.h (modified) (2 diffs)

uspace/lib/nic/include/nic.h

@@ -40 +40 @@
 
 #include <adt/list.h>
+#include <adt/hash_table.h>
 #include <ddf/driver.h>
 #include <device/hw_res_parsed.h>
@@ -53 +54 @@
  */
 typedef struct nic_wol_virtue {
-        link_t item;
+        ht_link_t item;
         nic_wv_id_t id;
         nic_wv_type_t type;