lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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/imx/imx-ssi.c
View File

@@ -16,7 +16,7 @@
* sane processor vendors have a FIFO per AC97 slot, the i.MX has only
* one FIFO which combines all valid receive slots. We cannot even select
* which slots we want to receive. The WM9712 with which this driver
* was developped with always sends GPIO status data in slot 12 which
* was developed with always sends GPIO status data in slot 12 which
* we receive in our (PCM-) data stream. The only chance we have is to
* manually skip this data in the FIQ handler. With sampling rates different
* from 48000Hz not every frame has valid receive data, so the ratio