aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/88pm860x-codec.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-22 20:56:20 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-22 21:07:23 -0500
commit1435b9402fe0fb27ac4ec5bb271112de2c4806c0 (patch)
tree5c800d20cb3a19668f8dbf35cfc20cd649bd766b /sound/soc/codecs/88pm860x-codec.c
parent6a504a751124889e0bdbb25963a7edf7aeedb7bd (diff)
ASoC: ifdef out trace points from modules for x86
No idea why this works on ARM but not x86. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
-rw-r--r--sound/soc/codecs/88pm860x-codec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index a34fb924e77b..3e798a12ee3d 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1263,9 +1263,11 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data)
1263 mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt 1263 mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt
1264 | pm860x->det.hp_det; 1264 | pm860x->det.hp_det;
1265 1265
1266#ifndef CONFIG_SND_SOC_88PM860X
1266 if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | 1267 if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |
1267 SHORT_LO1 | SHORT_LO2)) 1268 SHORT_LO1 | SHORT_LO2))
1268 trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); 1269 trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));
1270#endif
1269 1271
1270 if ((pm860x->det.hp_det & SND_JACK_HEADPHONE) 1272 if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
1271 && (status & HEADSET_STATUS)) 1273 && (status & HEADSET_STATUS))