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/boot/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/boot/Makefile')
| -rw-r--r-- | arch/x86_64/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile index 18c6e915d69b..29f8396ed151 100644 --- a/arch/x86_64/boot/Makefile +++ b/arch/x86_64/boot/Makefile | |||
| @@ -98,5 +98,5 @@ zlilo: $(BOOTIMAGE) | |||
| 98 | cp System.map $(INSTALL_PATH)/ | 98 | cp System.map $(INSTALL_PATH)/ |
| 99 | if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi | 99 | if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi |
| 100 | 100 | ||
| 101 | install: $(BOOTIMAGE) | 101 | install: |
| 102 | sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" | 102 | sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" |