Changeset e2a6b72 in mainline for uspace/drv/nic/rtl8139/driver.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/rtl8139/driver.c (modified) (2 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -34 +34 @@
 #include <align.h>
 #include <byteorder.h>
-#include <libarch/ddi.h>
 #include <libarch/barrier.h>
 
@@ -2187 +2186 @@
                 &rtl8139_driver_ops, &rtl8139_dev_ops, &rtl8139_nic_iface);
 
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         ddf_msg(LVL_NOTE, "HelenOS RTL8139 driver started");
         return ddf_driver_main(&rtl8139_driver);