diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:07 +1100 |
| commit | b6a9f0e3ba8c158505f97e613f1a665a7aa6974b (patch) | |
| tree | 531fd9e703e6104ef45736a97703dae9b42bd7bc /arch/arm/mach-davinci/include/mach/edma.h | |
| parent | 36a71789f61edc2ad31b2d09c579c583570ec13a (diff) | |
| parent | 511f15c134ef4c026fc7bb61635bd1661520fe39 (diff) | |
Merge remote branch 'davinci/davinci-next'
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/edma.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/edma.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/edma.h b/arch/arm/mach-davinci/include/mach/edma.h index eb8bfd7925e7..ced3092af5ba 100644 --- a/arch/arm/mach-davinci/include/mach/edma.h +++ b/arch/arm/mach-davinci/include/mach/edma.h @@ -280,8 +280,6 @@ struct edma_soc_info { unsigned n_cc; enum dma_event_q default_queue; - /* list of channels with no even trigger; terminated by "-1" */ - const s8 *noevent; const s8 (*queue_tc_mapping)[2]; const s8 (*queue_priority_mapping)[2]; }; |