git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dm355.c
diff --git
a/arch/arm/mach-davinci/dm355.c
b/arch/arm/mach-davinci/dm355.c
index
c143f43
..
fe520d4
100644
(file)
--- a/
arch/arm/mach-davinci/dm355.c
+++ b/
arch/arm/mach-davinci/dm355.c
@@
-591,6
+591,7
@@
static struct edma_soc_info edma_cc0_info = {
.n_cc = 1,
.queue_tc_mapping = queue_tc_mapping,
.queue_priority_mapping = queue_priority_mapping,
.n_cc = 1,
.queue_tc_mapping = queue_tc_mapping,
.queue_priority_mapping = queue_priority_mapping,
+ .default_queue = EVENTQ_1,
};
static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = {
};
static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = {