diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-21 02:38:47 +0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-21 02:38:47 +0400 |
| commit | 0ddd80856b7b99cab198a09ed6cc9edb794fdb3e (patch) | |
| tree | 9f985b9e343e4194a63e29616acb954b33c62611 /include/linux | |
| parent | f40788a6663267fc985a5871034f2638002f5bd6 (diff) | |
| parent | 34c93c8657935d30649e777c4aa05f74f16aa418 (diff) | |
| download | linux-0ddd80856b7b99cab198a09ed6cc9edb794fdb3e.tar.xz | |
Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
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 |