diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /arch/x86_64/Makefile | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'arch/x86_64/Makefile')
| -rw-r--r-- | arch/x86_64/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index a9cd42e61828..51d83288d62b 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile | |||
| @@ -80,9 +80,12 @@ bzlilo: vmlinux | |||
| 80 | bzdisk: vmlinux | 80 | bzdisk: vmlinux |
| 81 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk | 81 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) zdisk |
| 82 | 82 | ||
| 83 | install fdimage fdimage144 fdimage288: vmlinux | 83 | fdimage fdimage144 fdimage288: vmlinux |
| 84 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | 84 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ |
| 85 | 85 | ||
| 86 | install: | ||
| 87 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ | ||
| 88 | |||
| 86 | archclean: | 89 | archclean: |
| 87 | $(Q)$(MAKE) $(clean)=$(boot) | 90 | $(Q)$(MAKE) $(clean)=$(boot) |
| 88 | 91 | ||