Changeset da68871a in mainline for kernel/Makefile

Timestamp:

2012-08-08T08:46:22Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (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:

Merged changes from mainline.

File:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -197 +197 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/cpu/cpu_mask.c \