diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:27:45 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:27:45 +0000 |
commit | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 (patch) | |
tree | c60bdca0529cbd44d32b3918b78d14e182ef57cd /arch/arm/mach-davinci/board-da850-evm.c | |
parent | 3b0d597139efddfd8960b44249b4a4c977d172f1 (diff) | |
parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) |
Merge branch 'v3.2-rc7' into next/pm
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
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 1d7d2499522..6659a90dbca 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -753,7 +753,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, - .asp_chan_q = EVENTQ_1, + .asp_chan_q = EVENTQ_0, .version = MCASP_VERSION_2, .txnumevt = 1, .rxnumevt = 1, |