diff options
author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /arch/arm/Makefile | |
parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 130e6228b587..7779f2d1acad 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -175,10 +175,10 @@ else | |||
175 | endif | 175 | endif |
176 | @touch $@ | 176 | @touch $@ |
177 | 177 | ||
178 | archprepare: maketools include/asm-arm/.arch | 178 | archprepare: maketools |
179 | 179 | ||
180 | .PHONY: maketools FORCE | 180 | .PHONY: maketools FORCE |
181 | maketools: include/linux/version.h FORCE | 181 | maketools: include/linux/version.h include/asm-arm/.arch FORCE |
182 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h | 182 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h |
183 | 183 | ||
184 | # Convert bzImage to zImage | 184 | # Convert bzImage to zImage |