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

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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/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);