diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 16:49:18 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 16:49:18 +0100 |
| commit | ac67c6247361b3b8644b34e5301a46d5069c1373 (patch) | |
| tree | dd83147e304181e889eefa39e5056451031f4b5d /arch/um/sys-x86_64/Makefile | |
| parent | [PATCH] sky2: version 0.11 (diff) | |
| parent | Linux v2.6.15 (diff) | |
| download | linux-ac67c6247361b3b8644b34e5301a46d5069c1373.tar.xz linux-ac67c6247361b3b8644b34e5301a46d5069c1373.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/um/sys-x86_64/Makefile')
| -rw-r--r-- | arch/um/sys-x86_64/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index 00b2025427df..a351091fbd99 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -6,8 +6,9 @@ #XXX: why into lib-y? lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \ - ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \ - stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o + ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \ + syscall_table.o sysrq.o thunk.o +lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o obj-y := ksyms.o obj-$(CONFIG_MODULES) += module.o um_module.o |