diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
| commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
| tree | 47135be4252faecbc0e5508658a58f8afd197fff /arch/arm/mach-davinci/board-da850-evm.c | |
| parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
| parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) | |
| download | op-kernel-dev-e71981343ad29b5d929f82ac56c0b27b8ea0e540.zip op-kernel-dev-e71981343ad29b5d929f82ac56c0b27b8ea0e540.tar.gz | |
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 b280efb..e8c8190 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 = { .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), .tdm_slots = 2, .serial_dir = da850_iis_serializer_direction, - .eventq_no = EVENTQ_1, + .asp_chan_q = EVENTQ_1, .version = MCASP_VERSION_2, .txnumevt = 1, .rxnumevt = 1, |
