Changeset e2a6b72 in mainline for uspace/drv/bus/pci/pciintel

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/bus/pci/pciintel/pci.c (modified) (2 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -58 +58 @@
 #include <device/hw_res.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <pci_dev_iface.h>
 
@@ -729 +728 @@
 static void pciintel_init(void)
 {
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
         pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;