linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ppc: fix build of DCR bits on 4xx
@ 2006-12-12  5:23 Benjamin Herrenschmidt
  2006-12-12  5:31 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2006-12-12  5:23 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev list

The new dcr.c file shouldn't be compiled on arch/ppc, and dcr-low.S
should only be built if CONFIG_PPC_DCR_NATIVE is set.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Index: linux-cell/arch/powerpc/sysdev/Makefile
===================================================================
--- linux-cell.orig/arch/powerpc/sysdev/Makefile	2006-12-12 16:18:27.000000000 +1100
+++ linux-cell/arch/powerpc/sysdev/Makefile	2006-12-12 16:19:12.000000000 +1100
@@ -5,7 +5,7 @@ endif
 obj-$(CONFIG_MPIC)		+= mpic.o
 obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o
 obj-$(CONFIG_PPC_MPC106)	+= grackle.o
-obj-$(CONFIG_PPC_DCR)		+= dcr.o dcr-low.o
+obj-$(CONFIG_PPC_DCR_NATIVE)	+= dcr-low.o
 obj-$(CONFIG_U3_DART)		+= dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
@@ -14,6 +14,7 @@ obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 obj-$(CONFIG_OF_SERIAL)	+= of_serial.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
+obj-$(CONFIG_PPC_DCR)		+= dcr.o
 obj-$(CONFIG_PPC_I8259)		+= i8259.o
 obj-$(CONFIG_PPC_83xx)		+= ipic.o
 obj-$(CONFIG_PPC_MPC52xx)	+= mpc52xx_pic.o

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ppc: fix build of DCR bits on 4xx
  2006-12-12  5:23 [PATCH] ppc: fix build of DCR bits on 4xx Benjamin Herrenschmidt
@ 2006-12-12  5:31 ` Benjamin Herrenschmidt
  0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2006-12-12  5:31 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev list

On Tue, 2006-12-12 at 16:23 +1100, Benjamin Herrenschmidt wrote:
> The new dcr.c file shouldn't be compiled on arch/ppc, and dcr-low.S
> should only be built if CONFIG_PPC_DCR_NATIVE is set.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Hrm... it collides with Kumar's patch, sorry, I'll send a fixed one

Ben.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-12-12  5:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-12  5:23 [PATCH] ppc: fix build of DCR bits on 4xx Benjamin Herrenschmidt
2006-12-12  5:31 ` Benjamin Herrenschmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).