Merge branch 'master'

[linux-2.6-omap-h63xx.git] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index c1ea6bcb77ce82cdf88a7aa4c2f3bf50b581a793..73a09a6ee6c8227f96192a3ef821575d3514c471 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -76,9 +76,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/
@@ -102,16 +100,6 @@ image: vmlinux
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                  include/config/MARKER
-
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-       $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES += include/asm-$(ARCH)/offsets.h
-
 # Don't use tabs in echo arguments
 define archhelp
   echo  '* image           - Kernel image for IPL ($(boot)/image)'