From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B32252C00A6 for ; Thu, 20 Feb 2014 09:07:44 +1100 (EST) From: Paul Gortmaker To: Greg Kroah-Hartman Subject: [PATCH] powerpc: select MEMORY for FSL_IFC to not break existing .config files Date: Wed, 19 Feb 2014 17:07:21 -0500 Message-ID: <1392847641-63777-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Cc: Arnd Bergmann , Paul Gortmaker , linux-next@vger.kernel.org, Paul Mackerras , linuxppc-dev@lists.ozlabs.org, Prabhakar Kushwaha List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , commit d2ae2e20fbdde5a65f3a5a153044ab1e5c53f7cc ("driver/memory:Move Freescale IFC driver to a common driver") introduces this build regression into the mpc85xx_defconfig: drivers/built-in.o: In function `fsl_ifc_nand_remove': drivers/mtd/nand/fsl_ifc_nand.c:1147: undefined reference to `fsl_ifc_ctrl_dev' drivers/mtd/nand/fsl_ifc_nand.c:1147: undefined reference to `fsl_ifc_ctrl_dev' drivers/built-in.o: In function `fsl_ifc_nand_probe': drivers/mtd/nand/fsl_ifc_nand.c:1031: undefined reference to `fsl_ifc_ctrl_dev' drivers/mtd/nand/fsl_ifc_nand.c:1031: undefined reference to `fsl_ifc_ctrl_dev' drivers/built-in.o: In function `match_bank': drivers/mtd/nand/fsl_ifc_nand.c:1013: undefined reference to `convert_ifc_address' drivers/built-in.o: In function `fsl_ifc_nand_probe': drivers/mtd/nand/fsl_ifc_nand.c:1059: undefined reference to `fsl_ifc_ctrl_dev' drivers/mtd/nand/fsl_ifc_nand.c:1080: undefined reference to `fsl_ifc_ctrl_dev' drivers/mtd/nand/fsl_ifc_nand.c:1069: undefined reference to `fsl_ifc_ctrl_dev' drivers/mtd/nand/fsl_ifc_nand.c:1069: undefined reference to `fsl_ifc_ctrl_dev' make: *** [vmlinux] Error 1 This happens because there is nothing to descend us into the drivers/memory directory in the mpc85xx_defconfig. It wasn't selecting CONFIG_MEMORY. So we never built drivers/memory/fsl_ifc.o even with CONFIG_FSL_IFC=y, and so we have nothing to link against. In order to remain compatible with old config files and to avoid such build failures, make CONFIG_FSL_IFC select CONFIG_MEMORY. Also fix the whitespace issue (spaces vs. a tab) in the Kconfig. Cc: Prabhakar Kushwaha Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: Paul Gortmaker --- [This probably makes sense to go in via Greg's char-misc/char-misc-next (vs. powerpc-next) since that is where the regression was introduced.] arch/powerpc/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 957bf344c0f5..d2d8d8f50610 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -738,7 +738,8 @@ config FSL_LBC config FSL_IFC bool - depends on FSL_SOC + depends on FSL_SOC + select MEMORY config FSL_GTM bool -- 1.8.5.2