Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 189c8f3a369ce612ecfeb6b7af352fb75350fcf7..6c6b197898d0b61c0529636c318f24a57b41756e 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -13,21 +13,21 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-ifdef CONFIG_ARCH_S390_31
+ifndef CONFIG_64BIT
 LDFLAGS                := -m elf_s390
 CFLAGS         += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
 STACK_SIZE     := 8192
-endif
-
-ifdef CONFIG_ARCH_S390X
+CHECKFLAGS     += -D__s390__
+else
 LDFLAGS                := -m elf64_s390
 MODFLAGS       += -fpic -D__PIC__
 CFLAGS         += -m64
 AFLAGS         += -m64
 UTS_MACHINE    := s390x
 STACK_SIZE     := 16384
+CHECKFLAGS     += -D__s390__ -D__s390x__
 endif
 
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
@@ -74,9 +74,7 @@ AFLAGS                += $(aflags-y)
 OBJCOPYFLAGS   := -O binary
 LDFLAGS_vmlinux := -e start
 
-head-$(CONFIG_ARCH_S390_31)    += arch/$(ARCH)/kernel/head.o
-head-$(CONFIG_ARCH_S390X)      += arch/$(ARCH)/kernel/head64.o
-head-y                         += arch/$(ARCH)/kernel/init_task.o
+head-y         := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
 core-y         += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \
                   arch/$(ARCH)/appldata/