Changeset 6843a9c in mainline for uspace/lib/drv/Makefile

Timestamp:

2012-06-29T13:02:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/drv/Makefile (modified) (1 diff)

uspace/lib/drv/Makefile

@@ -35 +35 @@
         generic/driver.c \
         generic/dev_iface.c \
+        generic/interrupt.c \
         generic/log.c \
         generic/logbuf.c \