Changeset 8989f2a7 in mainline for uspace/Makefile

Timestamp:

2012-01-15T10:38:46Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

121e7adf

Parents:

9957a97 (diff), f302586 (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 with mainline

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -95 +95 @@
         srv/hid/fb \
         srv/hid/input \
-        srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
         srv/net/il/arp \
@@ -107 +106 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \