diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /arch/powerpc/boot/Makefile | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'arch/powerpc/boot/Makefile')
| -rw-r--r-- | arch/powerpc/boot/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 751a6e6070d2..0055edbc774c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -279,7 +279,8 @@ endif | |||
| 279 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 279 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
| 280 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 280 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
| 281 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 281 | $(patsubst dtbImage%, dtbImage.initrd%, \ |
| 282 | $(patsubst treeImage%, treeImage.initrd%, $(image-y)))) | 282 | $(patsubst simpleImage%, simpleImage.initrd%, \ |
| 283 | $(patsubst treeImage%, treeImage.initrd%, $(image-y))))) | ||
| 283 | initrd-y := $(filter-out $(image-y), $(initrd-y)) | 284 | initrd-y := $(filter-out $(image-y), $(initrd-y)) |
| 284 | targets += $(image-y) $(initrd-y) | 285 | targets += $(image-y) $(initrd-y) |
| 285 | 286 | ||