Changeset f991b6b in mainline for uspace/Makefile

Timestamp:

2012-01-14T09:53:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6d8455d

Parents:

0a549cc (diff), d5c60a2 (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 i8042kbd/mouse DDF drivers.

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

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