Changeset 5828554 in mainline for uspace/lib/c/Makefile

Timestamp:

2014-01-19T14:37:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/lib/c/Makefile (modified) (5 diffs)

uspace/lib/c/Makefile

@@ -61 +61 @@
         generic/bd.c \
         generic/bd_srv.c \
-        generic/bitops.c \
         generic/cap.c \
         generic/cfg.c \
@@ -70 +69 @@
         generic/device/hw_res_parsed.c \
         generic/device/pio_window.c \
-        generic/device/char_dev.c \
         generic/device/clock_dev.c \
-        generic/device/battery_dev.c \
-        generic/device/graph_dev.c \
-        generic/device/nic.c \
-        generic/device/pci.c \
-        generic/device/ahci.c \
         generic/dhcp.c \
         generic/dnsr.c \
@@ -108 +101 @@
         generic/io/log.c \
         generic/io/logctl.c \
+        generic/io/kio.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -129 +123 @@
         generic/loader.c \
         generic/getopt.c \
+        generic/adt/checksum.c \
         generic/adt/list.c \
         generic/adt/hash_table.c \
@@ -143 +138 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \