diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-04-23 14:09:07 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-01 06:12:51 -0400 |
| commit | ef403bcaf16b704b772cf33cc2871fb8693d3bb3 (patch) | |
| tree | 196bc3f714e2c74815c71cfc0673fbf63e9e06ab /drivers/input | |
| parent | 5d9b709a1724f27fbb17add0e287134b7039e0aa (diff) | |
[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>
Diffstat (limited to 'drivers/input')
| -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 | |||
| 979 | 979 | ||
| 980 | config TOUCHSCREEN_SUR40 | 980 | config TOUCHSCREEN_SUR40 |
| 981 | tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen" | 981 | tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen" |
| 982 | depends on USB | 982 | depends on USB && MEDIA_USB_SUPPORT && HAS_DMA |
| 983 | depends on MEDIA_USB_SUPPORT | ||
| 984 | select INPUT_POLLDEV | 983 | select INPUT_POLLDEV |
| 985 | select VIDEOBUF2_DMA_SG | 984 | select VIDEOBUF2_DMA_SG |
| 986 | help | 985 | help |