diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
| commit | b73b636e8987f8728c6c700377615757691b9a55 (patch) | |
| tree | 554a4c799888e8934d2bf222bd0fcae2a9146bb4 /arch/cris/arch-v10/boot/rescue | |
| parent | ed09441dacc2a2d6c170aa3b1f79a041291a813f (diff) | |
| parent | 8f808417fe211648c0816e28947cdc74eb1e1032 (diff) | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: proper defconfig setup
[CRIS] Rename boot-linkscripts and fix the path to them.
Diffstat (limited to 'arch/cris/arch-v10/boot/rescue')
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/rescue.lds (renamed from arch/cris/arch-v10/boot/rescue/rescue.ld) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile index 07688da9270..82ab59b968e 100644 --- a/arch/cris/arch-v10/boot/rescue/Makefile +++ b/arch/cris/arch-v10/boot/rescue/Makefile @@ -4,7 +4,7 @@ ccflags-y += -O2 $(LINUXINCLUDE) asflags-y += $(LINUXINCLUDE) -ldflags-y += -T $(srctree)/$(obj)/rescue.ld +ldflags-y += -T $(srctree)/$(src)/rescue.lds OBJCOPYFLAGS = -O binary --remove-section=.bss obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o OBJECT := $(obj)/head.o diff --git a/arch/cris/arch-v10/boot/rescue/rescue.ld b/arch/cris/arch-v10/boot/rescue/rescue.lds index 0b52a9490db..0b52a9490db 100644 --- a/arch/cris/arch-v10/boot/rescue/rescue.ld +++ b/arch/cris/arch-v10/boot/rescue/rescue.lds |