aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-08-01 18:14:09 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-08-01 18:14:09 -0400
commit4385e12b291a6816987cb88a74fc116f520180f8 (patch)
treec426ae22e63fc8242fcefacd5b4dc837b40197f2 /arch/sh/Makefile
parent26a8ef5326e390d89290822fb1f4fcf16845fd84 (diff)
sh: Revert the location change of auto-generated asm/machtypes.h
This ended up causing build breakage on O= builds, as reported by Adrian: <-- snip --> ... CC init/main.o In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/irq.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/irq.h:23, from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/hardirq.h:5, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/hardirq.h:7, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/asm-generic/local.h:5, from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/local.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/module.h:19, from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:13: /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/machvec.h:15:27: error: asm/machtypes.h: No such file or directory make[2]: *** [init/main.o] Error 1 <-- snip --> So we simply move machtypes.h back to its original place. asm-offsets.h is still generated there regardless, until such a time that we find a better place to stash auto-generated files. Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/Makefile')
-rw-r--r--arch/sh/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 25659ce74baa..7b70cfd2516a 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -164,7 +164,7 @@ KBUILD_AFLAGS += $(cflags-y)
164PHONY += maketools FORCE 164PHONY += maketools FORCE
165 165
166maketools: include/linux/version.h FORCE 166maketools: include/linux/version.h FORCE
167 $(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h 167 $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
168 168
169all: $(KBUILD_IMAGE) 169all: $(KBUILD_IMAGE)
170 170
@@ -215,4 +215,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S
215 $(call filechk,gen-syscalltab) 215 $(call filechk,gen-syscalltab)
216 216
217CLEAN_FILES += arch/sh/lib64/syscalltab.h \ 217CLEAN_FILES += arch/sh/lib64/syscalltab.h \
218 arch/sh/include/asm/machtypes.h 218 include/asm-sh/machtypes.h