summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-03 11:32:06 +0200
committerVinod Koul <vinod.koul@intel.com>2014-04-16 11:57:27 +0530
commit2dda47d1a416750bf69eb11dd9b6607d18287b0c (patch)
tree3de3ea6f5f9f4dfb4bbf56fe2c4a47d147f8a61c /drivers/media
parent5fc68a6cad658e45dca3e0a6607df3a8e5df4ef9 (diff)
downloadlinux-2dda47d1a416750bf69eb11dd9b6607d18287b0c.tar.gz
linux-2dda47d1a416750bf69eb11dd9b6607d18287b0c.tar.bz2
linux-2dda47d1a416750bf69eb11dd9b6607d18287b0c.zip
platform: Fix timberdale dependencies
VIDEO_TIMBERDALE selects TIMB_DMA which itself depends on MFD_TIMBERDALE, so VIDEO_TIMBERDALE should either select or depend on MFD_TIMBERDALE as well. I chose to make it depend on it because I think it makes more sense and it is consistent with what other options are doing. Adding a "|| HAS_IOMEM" to the TIMB_DMA dependencies silenced the kconfig warning about unmet direct dependencies but it was wrong: without MFD_TIMBERDALE, TIMB_DMA is useless as the driver has no device to bind to. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/Kconfig2
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