diff options
author | Jean Delvare <jdelvare@suse.de> | 2014-04-03 05:32:06 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-04-16 02:27:27 -0400 |
commit | 2dda47d1a416750bf69eb11dd9b6607d18287b0c (patch) | |
tree | 3de3ea6f5f9f4dfb4bbf56fe2c4a47d147f8a61c | |
parent | 5fc68a6cad658e45dca3e0a6607df3a8e5df4ef9 (diff) |
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>
-rw-r--r-- | drivers/dma/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/platform/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index ba06d1d2f99e..5c5863842de9 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -197,7 +197,7 @@ config AMCC_PPC440SPE_ADMA | |||
197 | 197 | ||
198 | config TIMB_DMA | 198 | config TIMB_DMA |
199 | tristate "Timberdale FPGA DMA support" | 199 | tristate "Timberdale FPGA DMA support" |
200 | depends on MFD_TIMBERDALE || HAS_IOMEM | 200 | depends on MFD_TIMBERDALE |
201 | select DMA_ENGINE | 201 | select DMA_ENGINE |
202 | help | 202 | help |
203 | Enable support for the Timberdale FPGA DMA engine. | 203 | Enable support for the Timberdale FPGA DMA engine. |
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 | |||
56 | 56 | ||
57 | config VIDEO_TIMBERDALE | 57 | config VIDEO_TIMBERDALE |
58 | tristate "Support for timberdale Video In/LogiWIN" | 58 | tristate "Support for timberdale Video In/LogiWIN" |
59 | depends on VIDEO_V4L2 && I2C && DMADEVICES | 59 | depends on MFD_TIMBERDALE && VIDEO_V4L2 && I2C && DMADEVICES |
60 | select DMA_ENGINE | 60 | select DMA_ENGINE |
61 | select TIMB_DMA | 61 | select TIMB_DMA |
62 | select VIDEO_ADV7180 | 62 | select VIDEO_ADV7180 |