diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-03-03 23:22:21 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-03-03 23:22:21 -0500 |
| commit | dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a (patch) | |
| tree | f36172b40f9f3fc2c646f70da40e01705399b6b8 /arch/arm | |
| parent | aa4d72ae946a4fa40486b871717778734184fa29 (diff) | |
| parent | 56a5d3cf21c71963c8fc506e9b9d3f71641d9c71 (diff) | |
Merge branch 'coh' into dmaengine
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/coh901318.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/arch/arm/mach-u300/include/mach/coh901318.h index f4cfee9c7d28..b8155b4e5ffa 100644 --- 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 { | |||
| 53 | * struct coh_dma_channel - dma channel base | 53 | * struct coh_dma_channel - dma channel base |
| 54 | * @name: ascii name of dma channel | 54 | * @name: ascii name of dma channel |
| 55 | * @number: channel id number | 55 | * @number: channel id number |
| 56 | * @desc_nbr_max: number of preallocated descriptortors | 56 | * @desc_nbr_max: number of preallocated descriptors |
| 57 | * @priority_high: prio of channel, 0 low otherwise high. | 57 | * @priority_high: prio of channel, 0 low otherwise high. |
| 58 | * @param: configuration parameters | 58 | * @param: configuration parameters |
| 59 | * @dev_addr: physical address of periphal connected to channel | 59 | * @dev_addr: physical address of periphal connected to channel |