diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 17:52:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 17:52:31 -0500 |
| commit | d6c662d4f13801fe5ce24e8bbdea321e2572d7e5 (patch) | |
| tree | 14e1736ed8ca9a1f846147355e3beebbeba3f78f /arch/powerpc/Makefile | |
| parent | 21b4da78c941f292f6daf87abb562d6285216e51 (diff) | |
| parent | 00adbf62bd16f6527e046b422349a54d783a3d86 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/Makefile')
| -rw-r--r-- | arch/powerpc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index efcad7601a7a..5500ab55d042 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -142,6 +142,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ | |||
| 142 | # Default to zImage, override when needed | 142 | # Default to zImage, override when needed |
| 143 | defaultimage-y := zImage | 143 | defaultimage-y := zImage |
| 144 | defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux | 144 | defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux |
| 145 | defaultimage-$(CONFIG_DEFAULT_UIMAGE) := uImage | ||
| 145 | KBUILD_IMAGE := $(defaultimage-y) | 146 | KBUILD_IMAGE := $(defaultimage-y) |
| 146 | all: $(KBUILD_IMAGE) | 147 | all: $(KBUILD_IMAGE) |
| 147 | 148 | ||