Index: uspace/drv/platform/icp/icp.c
===================================================================
--- uspace/drv/platform/icp/icp.c	(revision a416d070e73ee834d63f21236a755f5a56114201)
+++ uspace/drv/platform/icp/icp.c	(revision c212a03937276f657ca068f79bcfbd68dd0cdb9d)
@@ -279,12 +279,4 @@
 	int rc;
 
-	rc = icp_add_fun(dev, "kbd", "arm/pl050", &icp_kbd_fun_proto);
-	if (rc != EOK)
-		return rc;
-
-	rc = icp_add_fun(dev, "mouse", "arm/pl050", &icp_mouse_fun_proto);
-	if (rc != EOK)
-		return rc;
-
 	rc = icp_add_fun(dev, "intctl", "integratorcp/intctl",
 	    &icp_ic_fun_proto);
@@ -292,4 +284,12 @@
 		return rc;
 
+	rc = icp_add_fun(dev, "kbd", "arm/pl050", &icp_kbd_fun_proto);
+	if (rc != EOK)
+		return rc;
+
+	rc = icp_add_fun(dev, "mouse", "arm/pl050", &icp_mouse_fun_proto);
+	if (rc != EOK)
+		return rc;
+
 	return EOK;
 }