diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-27 13:57:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-27 13:57:00 -0700 |
| commit | c949ddf9eb140f69dbf4495f234b558fc9691cbb (patch) | |
| tree | 131c0f07c19535598f94c6764381257827c0da10 /include/linux/linkage.h | |
| parent | c7208164e66f63e3ec1759b98087849286410741 (diff) | |
| parent | fbeb91fe8e4107dc88df4eaa21de02c3fd9d1cd5 (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"We have three small fixes.
First one from Andy reverts the devm_request irq as we need to ensure
the tasklet is killed after irq is freed, so we need to do free irq in
our code. Other two from Arnd are fixing the compilation issue in
omap and sa11x0 drivers with ARM randconfigs"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: sa11x0: remove broken #ifdef
dmaengine: omap: hide filter_fn for built-in drivers
dmaengine: dw: went back to plain {request,free}_irq() calls
Diffstat (limited to 'include/linux/linkage.h')
0 files changed, 0 insertions, 0 deletions