Changeset efdfebc in mainline for kernel/Makefile

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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:

• kernel/Makefile (modified) (2 diffs)

kernel/Makefile

@@ -196 +196 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \
@@ -256 +257 @@
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \
+        generic/src/ipc/sysipc_ops.c \
+        generic/src/ipc/ops/clnestab.c \
+        generic/src/ipc/ops/conctmeto.c \
+        generic/src/ipc/ops/concttome.c \
+        generic/src/ipc/ops/connclone.c \
+        generic/src/ipc/ops/dataread.c \
+        generic/src/ipc/ops/datawrite.c \
+        generic/src/ipc/ops/debug.c \
+        generic/src/ipc/ops/sharein.c \
+        generic/src/ipc/ops/shareout.c \
+        generic/src/ipc/ops/stchngath.c \
         generic/src/ipc/ipcrsc.c \
         generic/src/ipc/irq.c \