linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH] ppc: Marvell mv64x60 drivers for ppc platforms fix
@ 2007-06-25  8:47 Yuri Tikhonov
  2007-06-25  9:11 ` Segher Boessenkool
  0 siblings, 1 reply; 7+ messages in thread
From: Yuri Tikhonov @ 2007-06-25  8:47 UTC (permalink / raw)
  To: linuxppc-dev


 Hi Dale, Kumar,

 Thank you for your comments. All they make sense. Here is an update.

 --

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index c3ce0bd..37c37a9 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -16,8 +16,6 @@ obj-$(CONFIG_FSL_SOC)         += fsl_soc.o
 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
-obj-$(CONFIG_MV64X60)          += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o

 # contains only the suspend handler for time
 obj-$(CONFIG_PM)               += timer.o
@@ -26,6 +24,8 @@ ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)                += i8259.o
 obj-$(CONFIG_PPC_83xx)         += ipic.o
 obj-$(CONFIG_4xx)              += uic.o
+mv64x60-$(CONFIG_PCI)          += mv64x60_pci.o
+obj-$(CONFIG_MV64X60)          += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
 endif

 # Temporary hack until we have migrated to asm-powerpc

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH] ppc: Marvell mv64x60 drivers for ppc platforms fix
@ 2007-06-24 11:52 Yuri Tikhonov
  2007-06-24 22:46 ` Dale Farnsworth
  0 siblings, 1 reply; 7+ messages in thread
From: Yuri Tikhonov @ 2007-06-24 11:52 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: Stefan Roese

 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 <yur@emcraft.com>

--

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

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

end of thread, other threads:[~2007-06-25 10:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-25  8:47 [PATCH] ppc: Marvell mv64x60 drivers for ppc platforms fix Yuri Tikhonov
2007-06-25  9:11 ` Segher Boessenkool
2007-06-25  9:51   ` Yuri Tikhonov
2007-06-25 10:14     ` Segher Boessenkool
  -- strict thread matches above, loose matches on Subject: below --
2007-06-24 11:52 Yuri Tikhonov
2007-06-24 22:46 ` Dale Farnsworth
2007-06-25  1:49   ` Kumar Gala

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).