diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /arch/s390/kernel/Makefile | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/s390/kernel/Makefile')
| -rw-r--r-- | arch/s390/kernel/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 86601a945709..9a33ed6ca696 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile | |||
| @@ -16,9 +16,11 @@ extra-y += head.o init_task.o vmlinux.lds | |||
| 16 | obj-$(CONFIG_MODULES) += s390_ksyms.o module.o | 16 | obj-$(CONFIG_MODULES) += s390_ksyms.o module.o |
| 17 | obj-$(CONFIG_SMP) += smp.o | 17 | obj-$(CONFIG_SMP) += smp.o |
| 18 | 18 | ||
| 19 | obj-$(CONFIG_AUDIT) += audit.o | ||
| 20 | compat-obj-$(CONFIG_AUDIT) += compat_audit.o | ||
| 19 | obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ | 21 | obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ |
| 20 | compat_wrapper.o compat_exec_domain.o \ | 22 | compat_wrapper.o compat_exec_domain.o \ |
| 21 | binfmt_elf32.o | 23 | binfmt_elf32.o $(compat-obj-y) |
| 22 | 24 | ||
| 23 | obj-$(CONFIG_VIRT_TIMER) += vtime.o | 25 | obj-$(CONFIG_VIRT_TIMER) += vtime.o |
| 24 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 26 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |