diff options
-rw-r--r-- | drivers/media/platform/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/platform/sti/bdisp/Kconfig | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 4776a8cb1071..a4e7d21c9e4c 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig | |||
@@ -216,7 +216,7 @@ config VIDEO_STI_BDISP | |||
216 | tristate "STMicroelectronics BDISP 2D blitter driver" | 216 | tristate "STMicroelectronics BDISP 2D blitter driver" |
217 | depends on VIDEO_DEV && VIDEO_V4L2 | 217 | depends on VIDEO_DEV && VIDEO_V4L2 |
218 | depends on ARCH_STI || COMPILE_TEST | 218 | depends on ARCH_STI || COMPILE_TEST |
219 | depends on HAS_DMA | 219 | depends on HAVE_DMA_ATTRS |
220 | select VIDEOBUF2_DMA_CONTIG | 220 | select VIDEOBUF2_DMA_CONTIG |
221 | select V4L2_MEM2MEM_DEV | 221 | select V4L2_MEM2MEM_DEV |
222 | help | 222 | help |
diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platform/sti/bdisp/Kconfig deleted file mode 100644 index afaf4a6ecc72..000000000000 --- a/drivers/media/platform/sti/bdisp/Kconfig +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | config VIDEO_STI_BDISP | ||
2 | tristate "STMicroelectronics BDISP 2D blitter driver" | ||
3 | depends on VIDEO_DEV && VIDEO_V4L2 | ||
4 | select VIDEOBUF2_DMA_CONTIG | ||
5 | select V4L2_MEM2MEM_DEV | ||
6 | help | ||
7 | This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC. | ||
8 | To compile this driver as a module, choose M here: the module will | ||
9 | be called bdisp.ko. | ||