diff --git a/[refs] b/[refs] index a68d2fe5a7bc..4bf3dbed2577 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53b9989bc75e185d0bf946e939ebe8534c8a9740 +refs/heads/master: 177d2bf5c7d3ab41bfb4ce2597dde668225958dd diff --git a/trunk/include/linux/dw_dmac.h b/trunk/include/linux/dw_dmac.h index e1c8c9e919ac..62a6190dee22 100644 --- a/trunk/include/linux/dw_dmac.h +++ b/trunk/include/linux/dw_dmac.h @@ -19,6 +19,8 @@ * @nr_channels: Number of channels supported by hardware (max 8) * @is_private: The device channels should be marked as private and not for * by the general purpose DMA channel allocator. + * @chan_allocation_order: Allocate channels starting from 0 or 7 + * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0. * @block_size: Maximum block size supported by the controller * @nr_masters: Number of AHB masters supported by the controller * @data_width: Maximum data width supported by hardware per AHB master