diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-23 01:56:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-23 02:07:23 +0000 |
| commit | 1435b9402fe0fb27ac4ec5bb271112de2c4806c0 (patch) | |
| tree | 5c800d20cb3a19668f8dbf35cfc20cd649bd766b /sound/soc/codecs/88pm860x-codec.c | |
| parent | 6a504a751124889e0bdbb25963a7edf7aeedb7bd (diff) | |
| download | kernel_samsung_smdk4412-1435b9402fe0fb27ac4ec5bb271112de2c4806c0.zip kernel_samsung_smdk4412-1435b9402fe0fb27ac4ec5bb271112de2c4806c0.tar.gz kernel_samsung_smdk4412-1435b9402fe0fb27ac4ec5bb271112de2c4806c0.tar.bz2 | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index a34fb92..3e798a1 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) mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt | pm860x->det.hp_det; +#ifndef CONFIG_SND_SOC_88PM860X if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | SHORT_LO1 | SHORT_LO2)) trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); +#endif if ((pm860x->det.hp_det & SND_JACK_HEADPHONE) && (status & HEADSET_STATUS)) |