diff options
| author | Linus Torvalds | 2012-08-02 20:45:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-08-02 20:45:42 +0200 |
| commit | 0a276d1675bc1b8de3ba269ba64b8f3e288d8309 (patch) | |
| tree | ff552f58874b245f5962487ef53ce27ebcda5857 /include/linux | |
| parent | Merge tag 'md-3.6' of git://neil.brown.name/md (diff) | |
| parent | sh: explicitly include sh_dma.h in setup-sh7722.c (diff) | |
| download | kernel-qcow2-linux-0a276d1675bc1b8de3ba269ba64b8f3e288d8309.tar.gz kernel-qcow2-linux-0a276d1675bc1b8de3ba269ba64b8f3e288d8309.tar.xz kernel-qcow2-linux-0a276d1675bc1b8de3ba269ba64b8f3e288d8309.zip | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (24 commits)
sh: explicitly include sh_dma.h in setup-sh7722.c
sh: ecovec: care CN5 VBUS if USB host mode
sh: sh7724: fixup renesas_usbhs clock settings
sh: intc: initial irqdomain support.
sh: pfc: Fix up init ordering mess.
serial: sh-sci: fix compilation breakage, when DMA is enabled
dmaengine: shdma: restore partial transfer calculation
sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
sh: Fix up recursive fault in oops with unset TTB.
sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
sh: select the fixed regulator driver on several boards
sh: ecovec: switch MMC power control to regulators
sh: add fixed voltage regulators to se7724
sh: add fixed voltage regulators to sdk7786
sh: add fixed voltage regulators to rsk
sh: add fixed voltage regulators to migor
sh: add fixed voltage regulators to kfr2r09
sh: add fixed voltage regulators to ap325rxa
sh: add fixed voltage regulators to sh7757lcr
sh: add fixed voltage regulators to sh2007
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/shdma-base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index 93f9821554b6..a3728bf66f0e 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h @@ -50,6 +50,7 @@ struct shdma_desc { struct list_head node; struct dma_async_tx_descriptor async_tx; enum dma_transfer_direction direction; + size_t partial; dma_cookie_t cookie; int chunks; int mark; @@ -98,6 +99,7 @@ struct shdma_ops { void (*start_xfer)(struct shdma_chan *, struct shdma_desc *); struct shdma_desc *(*embedded_desc)(void *, int); bool (*chan_irq)(struct shdma_chan *, int); + size_t (*get_partial)(struct shdma_chan *, struct shdma_desc *); }; struct shdma_dev { |