Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

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

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 27847e4ffcbfa5212a7ca87fc104941686c5473d..3a3a4c66ef87585903e9f85dec3f5859467021ff 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -66,18 +66,12 @@ boot                := arch/xtensa/boot
 
 archinc                := include/asm-xtensa
 
-arch/xtensa/kernel/asm-offsets.s: \
-       arch/xtensa/kernel/asm-offsets.c $(archinc)/.platform
-
-include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s
-       $(call filechk,gen-asm-offsets)
-
-prepare: $(archinc)/.platform $(archinc)/offsets.h
+archprepare: $(archinc)/.platform
 
 # Update machine cpu and platform symlinks if something which affects
 # them changed.
 
-$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/MARKER
+$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf
        @echo '  SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)'
        $(Q)mkdir -p $(archinc)
        $(Q)mkdir -p $(archinc)/xtensa
@@ -94,7 +88,7 @@ bzImage : zImage
 zImage zImage.initrd: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
-CLEAN_FILES    += arch/xtensa/vmlinux.lds $(archinc)/offset.h \
+CLEAN_FILES    += arch/xtensa/vmlinux.lds                      \
                   $(archinc)/platform $(archinc)/xtensa/config \
                   $(archinc)/.platform