From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Fabio Estevam <fabio.estevam@freescale.com>,
Shawn Guo <shawn.guo@linaro.org>, Mark Brown <broonie@linaro.org>,
Guenter Roeck <linux@roeck-us.net>
Subject: [ 12/16] ASoC: fsl: Fix module build
Date: Thu, 12 Sep 2013 11:15:04 -0700 [thread overview]
Message-ID: <20130912181157.536195478@linuxfoundation.org> (raw)
In-Reply-To: <20130912181156.173326121@linuxfoundation.org>
3.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <fabio.estevam@freescale.com>
commit 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 upstream.
Building imx_v6_v7_defconfig with all audio drivers as modules results in
the folowing build error:
ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also
built as modules and by using 'IS_ENABLED' to cover the module case.
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
[Guenter Roeck: back-ported to 3.11]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/fsl/Kconfig | 4 ++--
sound/soc/fsl/imx-pcm.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI
tristate
config SND_SOC_IMX_PCM_FIQ
- bool
+ tristate
select FIQ
config SND_SOC_IMX_PCM_DMA
- bool
+ tristate
select SND_SOC_GENERIC_DMAENGINE_PCM
config SND_SOC_IMX_AUDMUX
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_
dma_data->peripheral_type = IMX_DMATYPE_SSI;
}
-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
int imx_pcm_dma_init(struct platform_device *pdev);
void imx_pcm_dma_exit(struct platform_device *pdev);
#else
@@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(stru
}
#endif
-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
int imx_pcm_fiq_init(struct platform_device *pdev);
void imx_pcm_fiq_exit(struct platform_device *pdev);
#else
next prev parent reply other threads:[~2013-09-12 18:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-12 18:14 [ 00/16] 3.11.1-stable review Greg Kroah-Hartman
2013-09-12 18:14 ` [ 01/16] target: Fix trailing ASCII space usage in INQUIRY vendor+model Greg Kroah-Hartman
2013-09-12 18:14 ` [ 02/16] iscsi-target: Fix ImmediateData=Yes failure regression in >= v3.10 Greg Kroah-Hartman
2013-09-12 18:14 ` [ 03/16] iscsi-target: Fix iscsit_transport reference leak during NP thread reset Greg Kroah-Hartman
2013-09-12 18:14 ` [ 04/16] iscsi-target: Fix potential NULL pointer in solicited NOPOUT reject Greg Kroah-Hartman
2013-09-12 18:14 ` [ 05/16] target: Fix se_cmd->state_list leak regression during WRITE failure Greg Kroah-Hartman
2013-09-12 18:14 ` [ 06/16] mei: me: fix hardware reset flow Greg Kroah-Hartman
2013-09-12 18:14 ` [ 07/16] usb: acm gadget: Null termintate strings table Greg Kroah-Hartman
2013-09-12 18:15 ` [ 08/16] hwmon: (k10temp) Add support for Fam16h (Kabini) Greg Kroah-Hartman
2013-09-12 18:15 ` [ 09/16] Drivers: hv: vmbus: Fix a bug in the handling of channel offers Greg Kroah-Hartman
2013-09-12 18:15 ` [ 10/16] ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT Greg Kroah-Hartman
2013-09-12 18:15 ` [ 11/16] drivers/misc/hpilo: Correct panic when an AUX iLO is detected Greg Kroah-Hartman
2013-09-12 18:15 ` Greg Kroah-Hartman [this message]
2013-09-12 18:15 ` [ 13/16] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Greg Kroah-Hartman
2013-09-12 18:15 ` [ 14/16] crypto: xor - Check for osxsave as well as avx in crypto/xor Greg Kroah-Hartman
2013-09-12 18:15 ` [ 15/16] drivers/rtc/rtc-max77686.c: Fix wrong register Greg Kroah-Hartman
2013-09-12 18:15 ` [ 16/16] mwifiex: do not create AP and P2P interfaces upon driver loading Greg Kroah-Hartman
2013-09-12 18:17 ` [ 00/16] 3.11.1-stable review Linus Torvalds
2013-09-12 18:18 ` Linus Torvalds
2013-09-12 18:22 ` Greg Kroah-Hartman
2013-09-12 18:27 ` Greg Kroah-Hartman
2013-09-12 21:41 ` Stefan Lippers-Hollmann
2013-09-12 21:52 ` Greg Kroah-Hartman
2013-09-13 22:59 ` Shuah Khan
2013-09-13 23:03 ` Greg Kroah-Hartman
2013-09-12 22:37 ` Guenter Roeck
2013-09-12 23:07 ` Greg Kroah-Hartman
2013-09-13 0:12 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130912181157.536195478@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=broonie@linaro.org \
--cc=fabio.estevam@freescale.com \
--cc=g.liakhovetski@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=shawn.guo@linaro.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox