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/frv | |
| 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/frv')
| -rw-r--r-- | arch/frv/boot/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/boot/Makefile b/arch/frv/boot/Makefile index d75e0d771366..5dfc93fd945a 100644 --- a/arch/frv/boot/Makefile +++ b/arch/frv/boot/Makefile | |||
| @@ -57,10 +57,10 @@ initrd: | |||
| 57 | # installation | 57 | # installation |
| 58 | # | 58 | # |
| 59 | install: $(CONFIGURE) Image | 59 | install: $(CONFIGURE) Image |
| 60 | sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) Image $(TOPDIR)/System.map "$(INSTALL_PATH)" | 60 | sh ./install.sh $(KERNELRELEASE) Image $(TOPDIR)/System.map "$(INSTALL_PATH)" |
| 61 | 61 | ||
| 62 | zinstall: $(CONFIGURE) zImage | 62 | zinstall: $(CONFIGURE) zImage |
| 63 | sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)" | 63 | sh ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)" |
| 64 | 64 | ||
| 65 | # | 65 | # |
| 66 | # miscellany | 66 | # miscellany |