Changeset 03936831 in mainline for uspace/drv/platform/icp/icp.c

Timestamp:

2017-10-20T09:16:55Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1252e81

Parents:

fe1c48d (diff), 04efacc (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 to fix build

File:

• uspace/drv/platform/icp/icp.c (modified) (2 diffs)

uspace/drv/platform/icp/icp.c

@@ -279 +279 @@
         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 +284 @@
                 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;
 }