Index: uspace/lib/drv/generic/remote_hw_res.c
===================================================================
--- uspace/lib/drv/generic/remote_hw_res.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/drv/generic/remote_hw_res.c	(revision 3e242d25d5b49481f9f26ba4a66712daa6a48540)
@@ -41,15 +41,15 @@
 #include "ddf/driver.h"
 
-static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
-static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
-static void remote_hw_res_disable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_disable_interrupt(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
-static void remote_hw_res_clear_interrupt(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_clear_interrupt(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
-static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
-static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, ipc_callid_t,
+static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, cap_call_handle_t,
     ipc_call_t *);
 
@@ -69,5 +69,5 @@
 
 static void remote_hw_res_enable_interrupt(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
@@ -84,5 +84,5 @@
 
 static void remote_hw_res_disable_interrupt(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
@@ -99,5 +99,5 @@
 
 static void remote_hw_res_clear_interrupt(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
@@ -114,5 +114,5 @@
 
 static void remote_hw_res_get_resource_list(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
@@ -140,5 +140,5 @@
 
 static void remote_hw_res_dma_channel_setup(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = ops;
@@ -159,5 +159,5 @@
 
 static void remote_hw_res_dma_channel_remain(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
+    cap_call_handle_t callid, ipc_call_t *call)
 {
 	hw_res_ops_t *hw_res_ops = ops;