Merge branch 'coh' into dmaengine

git-mirror · Mar 4, 2010 · dd58ffc · dd58ffc
2 parents aa4d72a + 56a5d3c
commit dd58ffc
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 123 deletions.
diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/arch/arm/mach-u300/include/mach/coh901318.h
@@ -53,7 +53,7 @@ struct coh901318_params {
  * struct coh_dma_channel - dma channel base
  * @name: ascii name of dma channel
  * @number: channel id number
- * @desc_nbr_max: number of preallocated descriptortors
+ * @desc_nbr_max: number of preallocated descriptors
  * @priority_high: prio of channel, 0 low otherwise high.
  * @param: configuration parameters
  * @dev_addr: physical address of periphal connected to channel