diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-11 12:43:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-11 12:43:41 -0700 |
| commit | 1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90 (patch) | |
| tree | 53b3e76a70e4ca6f77e29bcd47124d8b6a0b208e /arch/cris/Makefile | |
| parent | 7b5ca22643beba8fdd5b7055e0594a514b3710d7 (diff) | |
| parent | 999fb23ef868719b8bd55ee3f6b1f7a8fd8016af (diff) | |
| download | op-kernel-dev-1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90.zip op-kernel-dev-1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90.tar.gz | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRISv32: Fix typo compile error in ARTPEC-3 gpio driver.
CRIS: Wire up syscalls signalfd4 to writev.
CRISv32: Remove obsolete vcs_hook.o from Makefile
CRIS: Merge machine dependent boot/compressed and boot/rescue
Diffstat (limited to 'arch/cris/Makefile')
| -rw-r--r-- | arch/cris/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/cris/Makefile b/arch/cris/Makefile index 3662cfb..71e17d3 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile @@ -70,7 +70,7 @@ SRC_ARCH = $(srctree)/arch/cris # cris object files path OBJ_ARCH = $(objtree)/arch/cris -boot := arch/cris/$(SARCH)/boot +boot := arch/cris/boot MACHINE := arch/cris/$(SARCH) all: zImage @@ -81,15 +81,15 @@ zImage Image: vmlinux archprepare: archclean: - $(Q)if [ -e arch/cris/$(SARCH)/boot ]; then \ - $(MAKE) $(clean)=arch/cris/$(SARCH)/boot; \ + $(Q)if [ -e arch/cris/boot ]; then \ + $(MAKE) $(clean)=arch/cris/boot; \ fi CLEAN_FILES += \ - $(MACHINE)/boot/zImage \ - $(MACHINE)/boot/compressed/decompress.bin \ - $(MACHINE)/boot/compressed/piggy.gz \ - $(MACHINE)/boot/rescue/rescue.bin + $(boot)/zImage \ + $(boot)/compressed/decompress.bin \ + $(boot)/compressed/piggy.gz \ + $(boot)/rescue/rescue.bin # MRPROPER_FILES += |
