diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 19:55:20 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 19:55:20 +0000 |
| commit | c9dc03ddbf4e71f20b78277d661388c1bc466258 (patch) | |
| tree | 91cf0a398dce3c8cb484a2d8e7dc185e907e4349 /include/linux | |
| parent | 61528f4e921f23e2a095aa11f27006b347e4ee70 (diff) | |
| parent | 34c93c8657935d30649e777c4aa05f74f16aa418 (diff) | |
Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Marvell XOR driver cleanup and DT binding for 3.8
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/dma-mv_xor.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/platform_data/dma-mv_xor.h b/include/linux/platform_data/dma-mv_xor.h index 2ba1f7d76eef..8ec18f64e396 100644 --- a/include/linux/platform_data/dma-mv_xor.h +++ b/include/linux/platform_data/dma-mv_xor.h @@ -10,15 +10,14 @@ #include <linux/dmaengine.h> #include <linux/mbus.h> -#define MV_XOR_SHARED_NAME "mv_xor_shared" -#define MV_XOR_NAME "mv_xor" +#define MV_XOR_NAME "mv_xor" -struct mv_xor_platform_data { - struct platform_device *shared; - int hw_id; +struct mv_xor_channel_data { dma_cap_mask_t cap_mask; - size_t pool_size; }; +struct mv_xor_platform_data { + struct mv_xor_channel_data *channels; +}; #endif |