diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 14:52:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 14:52:31 -0800 |
| commit | d6c662d4f13801fe5ce24e8bbdea321e2572d7e5 (patch) | |
| tree | 14e1736ed8ca9a1f846147355e3beebbeba3f78f /arch/powerpc/Makefile | |
| parent | 21b4da78c941f292f6daf87abb562d6285216e51 (diff) | |
| parent | 00adbf62bd16f6527e046b422349a54d783a3d86 (diff) | |
| download | linux-3.10-d6c662d4f13801fe5ce24e8bbdea321e2572d7e5.tar.gz linux-3.10-d6c662d4f13801fe5ce24e8bbdea321e2572d7e5.tar.bz2 linux-3.10-d6c662d4f13801fe5ce24e8bbdea321e2572d7e5.zip | |
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 efcad7601a7..5500ab55d04 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -142,6 +142,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ # Default to zImage, override when needed defaultimage-y := zImage defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux +defaultimage-$(CONFIG_DEFAULT_UIMAGE) := uImage KBUILD_IMAGE := $(defaultimage-y) all: $(KBUILD_IMAGE) |