diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-20 10:35:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-20 10:35:31 -0700 |
| commit | 372feacb36211faf18326cfddea85d69b9afe2e5 (patch) | |
| tree | af9758c01d5c05c073ec57e84777a9985862dbf3 /drivers/media/platform/Kconfig | |
| parent | 5269519f9f05888bf52c4b71ed84d37c03c8aadb (diff) | |
| parent | 8edc51c197b8f409bef7b21755254e6f3ce7ed23 (diff) | |
| download | linux-372feacb36211faf18326cfddea85d69b9afe2e5.tar.bz2 | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Back from long weekend here in India and now the time to send fixes
for slave dmaengine.
- Dan's fix of sirf xlate code
- Jean's fix for timberland
- edma fixes by Sekhar for SG handling and Yuan for changing init
call"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: fix eDMA driver as a subsys_initcall
dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
platform: Fix timberdale dependencies
dma: edma: fix incorrect SG list handling
Diffstat (limited to 'drivers/media/platform/Kconfig')
| -rw-r--r-- | drivers/media/platform/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index c137abfa0c54..20f1655e6d75 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -56,7 +56,7 @@ config VIDEO_VIU config VIDEO_TIMBERDALE tristate "Support for timberdale Video In/LogiWIN" - depends on VIDEO_V4L2 && I2C && DMADEVICES + depends on MFD_TIMBERDALE && VIDEO_V4L2 && I2C && DMADEVICES select DMA_ENGINE select TIMB_DMA select VIDEO_ADV7180 |