Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[pandora-kernel.git] / arch / arm / mach-davinci / dm644x.c

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 7ad1520..40fec31 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -492,16 +492,18 @@ queue_priority_mapping[][2] = {
        {-1, -1},
 };
 
-static struct edma_soc_info dm644x_edma_info[] = {
-       {
-               .n_channel              = 64,
-               .n_region               = 4,
-               .n_slot                 = 128,
-               .n_tc                   = 2,
-               .n_cc                   = 1,
-               .queue_tc_mapping       = queue_tc_mapping,
-               .queue_priority_mapping = queue_priority_mapping,
-       },
+static struct edma_soc_info edma_cc0_info = {
+       .n_channel              = 64,
+       .n_region               = 4,
+       .n_slot                 = 128,
+       .n_tc                   = 2,
+       .n_cc                   = 1,
+       .queue_tc_mapping       = queue_tc_mapping,
+       .queue_priority_mapping = queue_priority_mapping,
+};
+
+static struct edma_soc_info *dm644x_edma_info[EDMA_MAX_CC] = {
+       &edma_cc0_info,
 };
 
 static struct resource edma_resources[] = {