Revert "ax25: Fix std timer socket destroy handling."

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

diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 9564731ad3a8788c7690a23fd0a6ca36cfa50cd6..eac0533d6e4fcf11c92dd6236f3d09bdb774d88f 100644 (file)
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -98,36 +98,20 @@ libs-y   += arch/$(ARCH)/lib/
 
 drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/
 
+machdirs       := $(patsubst %,arch/blackfin/mach-%/, $(machine-y))
 
+KBUILD_CFLAGS += -Iarch/$(ARCH)/include/
+KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include
 
-#      Update machine arch symlinks if something which affects
-#      them changed.  We use .mach to indicate when they were updated
-#      last, otherwise make uses the target directory mtime.
-
-       show_mach_symlink = :
- quiet_show_mach_symlink = echo '  SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach'
-silent_show_mach_symlink = :
-include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf
-       @$($(quiet)show_mach_symlink)
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p include/asm-$(ARCH)
-       $(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach
-else
-       $(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach
-endif
-       @touch $@
+KBUILD_CPPFLAGS        += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 
 CLEAN_FILES += \
-       include/asm-$(ARCH)/asm-offsets.h \
+       arch/$(ARCH)/include/asm/asm-offsets.h \
        arch/$(ARCH)/kernel/asm-offsets.s \
-       include/asm-$(ARCH)/mach \
-       include/asm-$(ARCH)/.mach
 
-archprepare: include/asm-blackfin/.mach
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
-
 INSTALL_PATH ?= /tftpboot
 boot := arch/$(ARCH)/boot
 BOOT_TARGETS = vmImage