Changeset e2a6b72 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2012-10-15T16:28:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b3ab8f7

Parents:

7eb49f4 (diff), c4c2406 (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 and io improvements.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -45 +45 @@
 #include <ipc/irc.h>
 #include <ipc/ns.h>
-#include <libarch/ddi.h>
+#include <ddi.h>
 #include <as.h>
 #include <ddf/log.h>
@@ -2381 +2381 @@
             &e1000_nic_iface);
         
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         ddf_msg(LVL_NOTE, "HelenOS E1000 driver started");
         return ddf_driver_main(&e1000_driver);