Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix windfarm platform device usage
  [POWERPC] Fix i2c-powermac platform device usage
  [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
  [POWERPC] ARCH=ppc pt_regs fixes
  [POWERPC] Update maple defconfig
  [POWERPC] Fix Maple secondary IDE interrupt
  [POWERPC] Make U4 PCIe work on maple
  [POWERPC] cell: fix default zImage build target
  [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
  [POWERPC] Fix xmon IRQ handler for pt_regs removal

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 003520b56303..37ddfcab0003 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -105,10 +105,10 @@ wrapperbits	:= $(extra-y) $(addprefix $(obj)/,addnote hack-coff)
 # Bits for building various flavours of zImage
 
 ifneq ($(CROSS32_COMPILE),)
-CROSSWRAP := -C $(CROSS32_COMPILE)
+CROSSWRAP := -C "$(CROSS32_COMPILE)"
 else
 ifneq ($(CROSS_COMPILE),)
-CROSSWRAP := -C $(CROSS_COMPILE)
+CROSSWRAP := -C "$(CROSS_COMPILE)"
 endif
 endif
 
@@ -151,12 +151,12 @@ $(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)
 $(obj)/uImage: vmlinux $(wrapperbits)
         $(call cmd,wrap,uboot)
 
-image-$(CONFIG_PPC_PSERIES)     += zImage.pseries
-image-$(CONFIG_PPC_MAPLE)       += zImage.pseries
-image-$(CONFIG_PPC_CELL)        += zImage.pseries
-image-$(CONFIG_PPC_CHRP)        += zImage.chrp
-image-$(CONFIG_PPC_PMAC)        += zImage.pmac
-image-$(CONFIG_DEFAULT_UIMAGE)  += uImage
+image-$(CONFIG_PPC_PSERIES)             += zImage.pseries
+image-$(CONFIG_PPC_MAPLE)               += zImage.pseries
+image-$(CONFIG_PPC_IBM_CELL_BLADE)      += zImage.pseries
+image-$(CONFIG_PPC_CHRP)                += zImage.chrp
+image-$(CONFIG_PPC_PMAC)                += zImage.pmac
+image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
 
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.