From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 9 Sep 2005 22:46:49 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
X-Git-Tag: v2.6.14-rc1~256
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=486a153f0e294f7cc735838edcb6b32e623cbe52;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
---

486a153f0e294f7cc735838edcb6b32e623cbe52
diff --cc arch/ppc64/Makefile
index a91daa324e8,d795775a5cd..0a23aeacba8
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@@ -132,12 -124,8 +125,10 @@@ include3/asm
  	$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
  
  define archhelp
 -  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
 -  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'
 -  echo  '		   sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 -  echo  '		   (arch/$(ARCH)/boot/zImage.initrd)'
 +  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'
 +  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'
 +  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 +  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'
 +  echo  '  zImage              - zImage for pSeries machines'
 +  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'
  endef
- 
- CLEAN_FILES += include/asm-ppc64/offsets.h