diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /arch/um/sys-i386 | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/sys-i386')
| -rw-r--r-- | arch/um/sys-i386/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile index 964dc1a04c37..598b5c1903af 100644 --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile | |||
| @@ -6,7 +6,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ | |||
| 6 | ptrace_user.o setjmp.o signal.o stub.o stub_segv.o syscalls.o sysrq.o \ | 6 | ptrace_user.o setjmp.o signal.o stub.o stub_segv.o syscalls.o sysrq.o \ |
| 7 | sys_call_table.o tls.o | 7 | sys_call_table.o tls.o |
| 8 | 8 | ||
| 9 | subarch-obj-y = lib/bitops_32.o lib/semaphore_32.o lib/string_32.o | 9 | subarch-obj-y = lib/semaphore_32.o lib/string_32.o |
| 10 | subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o | 10 | subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o |
| 11 | subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o | 11 | subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o |
| 12 | 12 | ||