diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:35:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:35:51 -0400 |
| commit | ef88b7dba2b47c70037a34a599d383462bb74bd3 (patch) | |
| tree | f50afe82c446cbf93893880878b97339fbdb8f49 /arch | |
| parent | f65e77693aa5a1cf688fc378bc6913a56f9ff7b7 (diff) | |
| parent | aaebf4332018980fef4e601d1b5a6e52dd9e9ae4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68knommu/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile index 97022ed0da38..7ce5e55b2401 100644 --- a/arch/m68knommu/Makefile +++ b/arch/m68knommu/Makefile | |||
| @@ -114,7 +114,7 @@ libs-y += arch/m68knommu/lib/ | |||
| 114 | prepare: include/asm-$(ARCH)/asm-offsets.h | 114 | prepare: include/asm-$(ARCH)/asm-offsets.h |
| 115 | 115 | ||
| 116 | archclean: | 116 | archclean: |
| 117 | $(call descend arch/$(ARCH)/boot, subdirclean) | 117 | $(Q)$(MAKE) $(clean)=arch/m68knommu/boot |
| 118 | 118 | ||
| 119 | include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ | 119 | include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ |
| 120 | include/asm include/linux/version.h \ | 120 | include/asm include/linux/version.h \ |
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index d27b82595485..b0fdaee8d8d9 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -673,7 +673,7 @@ drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ | |||
| 673 | 673 | ||
| 674 | ifdef CONFIG_LASAT | 674 | ifdef CONFIG_LASAT |
| 675 | rom.bin rom.sw: vmlinux | 675 | rom.bin rom.sw: vmlinux |
| 676 | $(call descend,arch/mips/lasat/image,$@) | 676 | $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@ |
| 677 | endif | 677 | endif |
| 678 | 678 | ||
| 679 | # | 679 | # |