Changeset f14291b in mainline for uspace/Makefile

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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) (2 diffs)

uspace/Makefile

@@ -66 +66 @@
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
+        srv/hid/s3c24xx_ts \
         srv/hid/fb \
         srv/hid/kbd \
         srv/hw/char/i8042 \
+        srv/hw/char/s3c24xx_uart \
         srv/hw/netif/dp8390 \
         srv/net/cfg \
@@ -132 +134 @@
         lib/softint \
         lib/softfloat \
-        lib/socket \
+        lib/packet \
         lib/net