Merge master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / arch / s390 / kernel / Makefile

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 8584dd8..86601a9 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -8,33 +8,26 @@ obj-y :=  bitmap.o traps.o time.o process.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
             semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o
 
-extra-$(CONFIG_ARCH_S390_31)   += head.o 
-extra-$(CONFIG_ARCH_S390X)     += head64.o 
-extra-y                                += init_task.o vmlinux.lds
+obj-y  += $(if $(CONFIG_64BIT),entry64.o,entry.o)
+obj-y  += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
+
+extra-y                                += head.o init_task.o vmlinux.lds
 
 obj-$(CONFIG_MODULES)          += s390_ksyms.o module.o
 obj-$(CONFIG_SMP)              += smp.o
 
-obj-$(CONFIG_S390_SUPPORT)     += compat_linux.o compat_signal.o \
-                                       compat_ioctl.o compat_wrapper.o \
-                                       compat_exec_domain.o
-obj-$(CONFIG_BINFMT_ELF32)     += binfmt_elf32.o
-
-obj-$(CONFIG_ARCH_S390_31)     += entry.o reipl.o
-obj-$(CONFIG_ARCH_S390X)       += entry64.o reipl64.o
+obj-$(CONFIG_COMPAT)           += compat_linux.o compat_signal.o \
+                                       compat_wrapper.o compat_exec_domain.o \
+                                       binfmt_elf32.o
 
 obj-$(CONFIG_VIRT_TIMER)       += vtime.o
+obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 
 # Kexec part
 S390_KEXEC_OBJS := machine_kexec.o crash.o
-ifeq ($(CONFIG_ARCH_S390X),y)
-S390_KEXEC_OBJS += relocate_kernel64.o
-else
-S390_KEXEC_OBJS += relocate_kernel.o
-endif
+S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
 obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
 
-
 #
 # This is just to get the dependencies...
 #