Changeset db71e2a in mainline for uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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 changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (1 diff)

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -195 +195 @@
                 ddf_msg(LVL_ERROR, "Failed to add EHCI function for "
                     "BeagleBoard-xM platform.");
+        if (rootamdm37x_add_fun(dev, "dispc", "amdm37x&dispc", &ehci) != EOK)
+                ddf_msg(LVL_ERROR, "Failed to add dispc function for "
+                    "BeagleBoard-xM platform.");
 
         return EOK;