Subject: [PATCH] ppc: Marvell mv64x60 drivers for ppc platforms fix

From: Yuri Tikhonov <[email-masked]>
Date: Sun, 24 Jun 2007 15:52:31 +0400

This patch fixes the issue of erroneously involving the 
arch/powerpc/sysdev/mv64x60*.c files into the compilation 
process for ppc- (not powerpc-) based platforms (e.g., 
P3M750).

 Signed-off-by: Yuri Tikhonov <[email-masked]>

--

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index c3ce0bd..25eaa14 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -17,7 +17,9 @@ obj-$(CONFIG_FSL_PCIE)		+= fsl_pcie.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)		+= mv64x60_pci.o
+ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_MV64X60)		+= $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+endif
 
 # contains only the suspend handler for time
 obj-$(CONFIG_PM)		+= timer.o