Changeset a39cfb8 in mainline for kernel/Makefile

Timestamp:

2011-04-14T07:54:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 from development

File:

• kernel/Makefile (modified) (2 diffs)

kernel/Makefile

@@ -226 +226 @@
         generic/src/proc/task.c \
         generic/src/proc/the.c \
-        generic/src/proc/tasklet.c \
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
@@ -382 +381 @@
                 generic/src/main/kinit.c \
                 generic/src/proc/the.c \
-                generic/src/proc/tasklet.c \
                 generic/src/mm/frame.c \
                 generic/src/mm/page.c \