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

[deliverable/linux.git] / arch / arm / mach-davinci / dm646x.c

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 332d00d24dc205b1ef5a74659eee2aa6af8d96eb..6c3bbea7d77d8f8f2432ec9321936cedf2e942f5 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -532,16 +532,6 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = {
 /*----------------------------------------------------------------------*/
 
 /* Four Transfer Controllers on DM646x */
-static s8
-dm646x_queue_tc_mapping[][2] = {
-       /* {event queue no, TC no} */
-       {0, 0},
-       {1, 1},
-       {2, 2},
-       {3, 3},
-       {-1, -1},
-};
-
 static s8
 dm646x_queue_priority_mapping[][2] = {
        /* {event queue no, Priority} */
@@ -553,12 +543,6 @@ dm646x_queue_priority_mapping[][2] = {
 };
 
 static struct edma_soc_info edma_cc0_info = {
-       .n_channel              = 64,
-       .n_region               = 6,    /* 0-1, 4-7 */
-       .n_slot                 = 512,
-       .n_tc                   = 4,
-       .n_cc                   = 1,
-       .queue_tc_mapping       = dm646x_queue_tc_mapping,
        .queue_priority_mapping = dm646x_queue_priority_mapping,
        .default_queue          = EVENTQ_1,
 };