diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-16 14:09:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-16 14:09:34 -0700 |
| commit | 300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch) | |
| tree | 7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /arch/arm/mach-davinci/dm355.c | |
| parent | 0a492896ac07336c98f37ad7fab4a6387b6ada78 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
| download | linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.gz linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.bz2 linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
| -rw-r--r-- | arch/arm/mach-davinci/dm355.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 383478116ef5..3d996b659ff4 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -591,16 +591,18 @@ queue_priority_mapping[][2] = { {-1, -1}, }; -static struct edma_soc_info dm355_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 *dm355_edma_info[EDMA_MAX_CC] = { + &edma_cc0_info, }; static struct resource edma_resources[] = { |