From: Dirk Behme <dirk.behme@de.bosch.com>
Date: Wed, 14 Sep 2005 14:17:26 +0000 (+0300)
Subject: If omap-alsa-mixer.c is compiled as module,
X-Git-Tag: v2.6.15-omap2~226
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1afb5b9525c9ef1ee7411460f005db0d6a27a110;p=linux-2.6-omap-h63xx.git

If omap-alsa-mixer.c is compiled as module,
CONFIG_SENSORS_TLV320AIC23_MODULE is missing:
     CC [M]  sound/arm/omap-alsa-mixer.o
sound/arm/omap-alsa-mixer.c: In function SND_OMAP_WRITE'
sound/arm/omap-alsa-mixer.c: In function MIXER_NAME' undeclared (first
use in this function)
sound/arm/omap-alsa-mixer.c:487: error: (Each undeclared identifier is
reported only once
sound/arm/omap-alsa-mixer.c:487: error: for each function it appears in.)
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Btw: omap-alsa-mixer.c will not compile if CONFIG_SENSORS_TLV320AIC23 or
CONFIG_SENSORS_TLV320AIC23_MODULE aren't defined. May be this ifdef
should be removed?
---

diff --git a/sound/arm/omap-alsa-mixer.c b/sound/arm/omap-alsa-mixer.c
index f8cad080c79..742e5b627c4 100644
--- a/sound/arm/omap-alsa-mixer.c
+++ b/sound/arm/omap-alsa-mixer.c
@@ -65,7 +65,7 @@ MODULE_DESCRIPTION("OMAP Alsa mixer driver for ALSA");
  */
 
 /* Codec AIC23 */
-#ifdef CONFIG_SENSORS_TLV320AIC23
+#if defined(CONFIG_SENSORS_TLV320AIC23) || defined (CONFIG_SENSORS_TLV320AIC23_MODULE)
 
 extern __inline__ void audio_aic23_write(u8, u16);