Changeset 19b3cc6 in mainline for uspace/drv

Timestamp:

2014-01-17T23:12:10Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

Location:

uspace/drv/infrastructure

Files:

• rootmalta/rootmalta.c (modified) (1 diff)
• rootpc/rootpc.c (modified) (1 diff)

uspace/drv/infrastructure/rootmalta/rootmalta.c

@@ -52 +52 @@
 #include <ipc/dev_iface.h>
 #include <ops/hw_res.h>
-#include <device/hw_res.h>
 #include <ops/pio_window.h>
-#include <device/pio_window.h>
 #include <byteorder.h>
 

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -50 +50 @@
 #include <ipc/dev_iface.h>
 #include <ops/hw_res.h>
-#include <device/hw_res.h>
 #include <ops/pio_window.h>
-#include <device/pio_window.h>
 
 #define NAME "rootpc"