Changeset 33c2952 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2012-11-07T21:00:02Z (14 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

dcb0751

Parents:

fc89e32 (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:

Merged with mainline.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -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);