]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] Input: TOUCHSCREEN_SUR40 should depend on HAS_DMA
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 23 Apr 2015 18:09:07 +0000 (15:09 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 10:12:51 +0000 (07:12 -0300)
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>
drivers/input/touchscreen/Kconfig

index 80f6386709bffc7330499694968c43e62e331ded..05e4c6ffbe363690b0ba3e1c2f9d0626ed232fec 100644 (file)
@@ -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