Home » Mailing list archives » git-commits-head » 2010 » April » 30

powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

Previous thread: x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero by Linux Kernel Mailing List on Thursday, April 29, 2010 - 5:59 pm. (1 message)

Next thread: x86/PCI: never allocate PCI MMIO resources below BIOS_END by Linux Kernel Mailing List on Wednesday, April 28, 2010 - 8:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
Date: Thursday, April 29, 2010 - 5:59 pm

Gitweb:     http://git.kernel.org/linus/e0f278adc29e8986531a51e5ed33db42e34bf952
Commit:     e0f278adc29e8986531a51e5ed33db42e34bf952
Parent:     01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f
Author:     Anton Vorontsov <avorontsov@mvista.com>
AuthorDate: Fri Apr 16 23:07:24 2010 +0400
Committer:  Kumar Gala <galak@kernel.crashing.org>
CommitDate: Mon Apr 19 23:12:21 2010 -0500

    powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
    
    Currently some MPC85xx and MPC86xx boards fail to build without
    CONFIG_PCI:
    
    arch/powerpc/platforms/fsl_uli1575.c: In function 'quirk_final_uli5249':
    arch/powerpc/platforms/fsl_uli1575.c:234: error: implicit declaration of function 'pci_bus_for_each_resource'
    arch/powerpc/platforms/fsl_uli1575.c:234: error: expected ';' before '{' token
    cc1: warnings being treated as errors
    arch/powerpc/platforms/fsl_uli1575.c:223: warning: unused variable 'dummy'
    make[1]: *** [arch/powerpc/platforms/fsl_uli1575.o] Error 1
    
    This patch fixes the issue by appending 'if PCI' condition when
    selecting FSL_ULI1575 Kconfig symbol.
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/platforms/85xx/Kconfig |    4 ++--
 arch/powerpc/platforms/86xx/Kconfig |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index d951218..3a2ade2 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -51,7 +51,7 @@ config MPC85xx_DS
 	bool "Freescale MPC85xx DS"
 	select PPC_I8259
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select SWIOTLB
 	help
 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
@@ -60,7 +60,7 @@ config MPC85xx_RDB
 	bool "Freescale MPC85xx RDB"
 	select PPC_I8259
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select ...
[ message continues ]
Previous thread: x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero by Linux Kernel Mailing List on Thursday, April 29, 2010 - 5:59 pm. (1 message)

Next thread: x86/PCI: never allocate PCI MMIO resources below BIOS_END by Linux Kernel Mailing List on Wednesday, April 28, 2010 - 8:59 pm. (1 message)