diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/s390/kernel/Makefile | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/s390/kernel/Makefile')
| -rw-r--r-- | arch/s390/kernel/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 8584dd823218..7434c32bc631 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile | |||
| @@ -8,9 +8,7 @@ obj-y := bitmap.o traps.o time.o process.o \ | |||
| 8 | setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ | 8 | setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ |
| 9 | semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o | 9 | semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o |
| 10 | 10 | ||
| 11 | extra-$(CONFIG_ARCH_S390_31) += head.o | 11 | extra-y += head.o init_task.o vmlinux.lds |
| 12 | extra-$(CONFIG_ARCH_S390X) += head64.o | ||
| 13 | extra-y += init_task.o vmlinux.lds | ||
| 14 | 12 | ||
| 15 | obj-$(CONFIG_MODULES) += s390_ksyms.o module.o | 13 | obj-$(CONFIG_MODULES) += s390_ksyms.o module.o |
| 16 | obj-$(CONFIG_SMP) += smp.o | 14 | obj-$(CONFIG_SMP) += smp.o |