diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
| commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
| tree | 47135be4252faecbc0e5508658a58f8afd197fff /arch/arm/mach-davinci/board-da850-evm.c | |
| parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
| parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-davinci/board-da850-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index b280efb1fa12..e8c819090268 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
| @@ -343,7 +343,7 @@ static struct snd_platform_data da850_evm_snd_data = { | |||
| 343 | .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), | 343 | .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), |
| 344 | .tdm_slots = 2, | 344 | .tdm_slots = 2, |
| 345 | .serial_dir = da850_iis_serializer_direction, | 345 | .serial_dir = da850_iis_serializer_direction, |
| 346 | .eventq_no = EVENTQ_1, | 346 | .asp_chan_q = EVENTQ_1, |
| 347 | .version = MCASP_VERSION_2, | 347 | .version = MCASP_VERSION_2, |
| 348 | .txnumevt = 1, | 348 | .txnumevt = 1, |
| 349 | .rxnumevt = 1, | 349 | .rxnumevt = 1, |