diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-04-23 20:09:07 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-01 12:12:51 +0200 |
commit | ef403bcaf16b704b772cf33cc2871fb8693d3bb3 (patch) | |
tree | 196bc3f714e2c74815c71cfc0673fbf63e9e06ab | |
parent | [media] v4l: VIDEOBUF2_DMA_SG should depend on HAS_DMA (diff) | |
download | linux-ef403bcaf16b704b772cf33cc2871fb8693d3bb3.tar.xz linux-ef403bcaf16b704b772cf33cc2871fb8693d3bb3.zip |
[media] Input: TOUCHSCREEN_SUR40 should depend on HAS_DMA
If NO_DMA=y:
warning: (TOUCHSCREEN_SUR40 && VIDEO_TW68 && VIDEO_CX23885 && VIDEO_CX25821 && VIDEO_CX88 && VIDEO_SAA7134) selects VIDEOBUF2_DMA_SG which has unmet direct dependencies (MEDIA_SUPPORT && HAS_DMA)
ERROR: "dma_unmap_sg" [drivers/media/v4l2-core/videobuf2-dma-sg.ko] undefined!
ERROR: "dma_map_sg" [drivers/media/v4l2-core/videobuf2-dma-sg.ko] undefined!
ERROR: "dma_sync_sg_for_cpu" [drivers/media/v4l2-core/videobuf2-dma-sg.ko] undefined!
TOUCHSCREEN_SUR40 selects VIDEOBUF2_DMA_SG, which bypasses its
dependency on HAS_DMA. Make TOUCHSCREEN_SUR40 depend on HAS_DMA to fix
this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 80f6386709bf..05e4c6ffbe36 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -979,8 +979,7 @@ config TOUCHSCREEN_SUN4I config TOUCHSCREEN_SUR40 tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen" - depends on USB - depends on MEDIA_USB_SUPPORT + depends on USB && MEDIA_USB_SUPPORT && HAS_DMA select INPUT_POLLDEV select VIDEOBUF2_DMA_SG help |