Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535Ab3C0Nb7 (ORCPT ); Wed, 27 Mar 2013 09:31:59 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:37664 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153Ab3C0Nb5 (ORCPT ); Wed, 27 Mar 2013 09:31:57 -0400 Date: Wed, 27 Mar 2013 21:31:33 +0800 (CST) From: Xiong Zhou X-X-Sender: zx@M2420 To: linux-next@vger.kernel.org, Mark Brown cc: linux-kernel@vger.kernel.org, Stephen Rothwell Subject: [patch v2] sound/soc/codecs : fix build failure for next-20130325 Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2157 Lines: 60 From: Xiong Zhou This patch fixes build failure of next-20130325 (and also next-20130322), about sound soc codec modules. I try to fix this by moving arrays to the header last time. Failing message: ERROR: "arizona_rate_text" [sound/soc/codecs/snd-soc-wm-adsp.ko] undefined! ERROR: "arizona_rate_val" [sound/soc/codecs/snd-soc-wm-adsp.ko] undefined! WARNING: modpost: Found 5 section mismatch(es). These arrays, "arizona_rate_text" and "arizona_rate_val" are defined in arizona.c, while having a declaration in arizona.h which is included by wm_adsp.c. When config MFD_ARIZONA_I2C is not choosed, neither is SND_SOC_ARIZONA. But, if I2C is choosed at the same time, SND_SOC_WM_ADSP is selected. So this is the problem. SND_SOC_WM_ADSP depends on SND_SOC_ARIZONA. After make SND_SOC_WM_ADSP depends on SND_SOC_ARIZONA: ERROR: "wm_adsp1_init" [sound/soc/codecs/snd-soc-wm2200.ko] undefined! ERROR: "wm_adsp1_event" [sound/soc/codecs/snd-soc-wm2200.ko] undefined! ERROR: "wm_adsp_fw_controls" [sound/soc/codecs/snd-soc-wm2200.ko] undefined! This is the same like above. So make SND_SOC_WM2200 depends on SND_SOC_ARIZONA too, and I2C. Signed-off-by: Xiong Zhou --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 18fea10..f38af70 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -79,7 +79,6 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM0010 if SPI_MASTER select SND_SOC_WM1250_EV1 if I2C select SND_SOC_WM2000 if I2C - select SND_SOC_WM2200 if I2C select SND_SOC_WM5100 if I2C select SND_SOC_WM5102 if MFD_WM5102 select SND_SOC_WM5110 if MFD_WM5110 @@ -370,6 +369,7 @@ config SND_SOC_WM2000 tristate config SND_SOC_WM2200 + depends on SND_SOC_ARIZONA && I2C tristate config SND_SOC_WM5100 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/