--- zzzz-none-000/linux-2.6.28.10/arch/arm/Makefile	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/arm/Makefile	2009-06-11 14:46:13.000000000 +0000
@@ -144,6 +144,7 @@
  machine-$(CONFIG_ARCH_MSM)	   := msm
  machine-$(CONFIG_ARCH_LOKI)       := loki
  machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0
+ machine-$(CONFIG_ARCH_PUMA5)      := puma5
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.
@@ -205,10 +206,29 @@
 #	them changed.  We use .arch to indicate when they were updated
 #	last, otherwise make uses the target directory mtime.
 
+include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
+	@echo '  SYMLINK $(MACHINE)include/mach -> include/asm-arm/arch'
+ifneq ($(KBUILD_SRC),)
+	mkdir -p include/asm-arm
+	ln -fsn $(srctree)/$(MACHINE)include/mach include/asm-arm/arch
+else
+	mkdir -p include/asm-arm
+	ln -fsn ../../$(MACHINE)include/mach include/asm-arm/arch
+endif
+	@touch $@
+
+ifeq ($(KBUILD_SRC),)
+KBUILD_CPPFLAGS += -Iinclude/asm-arm/arch
+KBUILD_CPPFLAGS += -Iinclude/asm-arm/arch/generic
+else
+KBUILD_CPPFLAGS += -I$(srctree)/include/asm-arm/arch
+KBUILD_CPPFLAGS += -I$(srctree)/include/asm-arm/arch/generic
+endif
+
 archprepare: maketools
 
 PHONY += maketools FORCE
-maketools: include/linux/version.h FORCE
+maketools: include/linux/version.h include/asm-arm/.arch FORCE
 	$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
 
 # Convert bzImage to zImage