diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:37 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:37 -0500 |
| commit | 06f1c66324cc38f0a38e4714f4645758742d7b3f (patch) | |
| tree | c3fcf1770f9004813eec7504cd2c4301f16ef388 /sound/soc/samsung | |
| parent | 6f5716a214ca2342f6311ddc5fc214ddc813753a (diff) | |
| parent | 98869f68f2f68a9f238f5e96dbc3f838a0ff7136 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/littlemill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 0908bb05a5e7..de4cfdf5fdfc 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c | |||
| @@ -270,7 +270,7 @@ static int littlemill_late_probe(struct snd_soc_card *card) | |||
| 270 | return ret; | 270 | return ret; |
| 271 | 271 | ||
| 272 | /* This will check device compatibility itself */ | 272 | /* This will check device compatibility itself */ |
| 273 | wm8958_mic_detect(codec, &littlemill_headset, NULL, NULL); | 273 | wm8958_mic_detect(codec, &littlemill_headset, NULL, NULL, NULL, NULL); |
| 274 | 274 | ||
| 275 | /* As will this */ | 275 | /* As will this */ |
| 276 | wm8994_mic_detect(codec, &littlemill_headset, 1); | 276 | wm8994_mic_detect(codec, &littlemill_headset, 1); |