Changeset 7943c43 in mainline for uspace/Makefile

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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.

File:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -93 +93 @@
         srv/hid/fb \
         srv/hid/input \
-        srv/hw/char/i8042 \
+        srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
         srv/net/il/arp \
@@ -105 +105 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \
@@ -120 +123 @@
         drv/nic/lo \
         drv/nic/ne2k \
-        drv/nic/e1k
+        drv/nic/e1k \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)