Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9b3a6f4ab98809c93ac57fa5e11dff0575046efc
Commit:     9b3a6f4ab98809c93ac57fa5e11dff0575046efc
Parent:     a5b6ad6691763ee5eba46665d014d5abfe433df2
Author:     Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 2 15:45:29 2007 -0700
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Tue Jan 9 17:03:02 2007 +1100

    [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds
    
    sysdev/rom.c is for arch/powerpc only.  Don't compile it when building
    an arch/ppc kernel.
    
    Signed-off-by: Grant Likely <[EMAIL PROTECTED]>
    Acked-by: Sylvain Munaut <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/sysdev/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 04d4917..2621a7e 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_MMIO_NVRAM)      += mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)          += fsl_soc.o
 obj-$(CONFIG_TSI108_BRIDGE)    += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)     += qe_lib/
-obj-$(CONFIG_MTD)              += rom.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)                += i8259.o
@@ -21,5 +20,6 @@ endif
 
 # Temporary hack until we have migrated to asm-powerpc
 ifeq ($(ARCH),powerpc)
+obj-$(CONFIG_MTD)              += rom.o
 obj-$(CONFIG_CPM2)             += cpm2_common.o cpm2_pic.o
 endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to