xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Browse Source 
Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c
This commit is contained in:
Mark Brown
2011-04-18 18:07:43 +01:00
parent f030d60b30 b3c27b51db
commit d5381e42f6
3008 changed files with 10041 additions and 9777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/soc-jack.c
View File

@@ -331,7 +331,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
goto err;
if (gpios[i].wake) {
ret = set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
if (ret != 0)
printk(KERN_ERR
"Failed to mark GPIO %d as wake source: %d\n",