aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-15 05:35:39 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-24 16:23:43 -0400
commit8432164ddf7bfe40748ac49995356ab4dfda43b7 (patch)
treea9c0bc9d11cee78485db5499fcd3fbd176e1cbf3
parentdf065b373f882c4efc396afa1f31cd8afedab356 (diff)
[media] Sensoray 2255 uses videobuf2
commit 340a30c514 "s2255drv: upgrade to videobuf2" changed the API used by the s2255 driver, but did not modify the Kconfig statement, which can lead to build errors when no other driver already uses VIDEOBUF2_VMALLOC. This patch does the necessary Kconfig change. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/usb/s2255/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/s2255/Kconfig b/drivers/media/usb/s2255/Kconfig
index 7e8ee1f864ab..8c3fceef9a09 100644
--- a/drivers/media/usb/s2255/Kconfig
+++ b/drivers/media/usb/s2255/Kconfig
@@ -1,7 +1,7 @@
1config USB_S2255 1config USB_S2255
2 tristate "USB Sensoray 2255 video capture device" 2 tristate "USB Sensoray 2255 video capture device"
3 depends on VIDEO_V4L2 3 depends on VIDEO_V4L2
4 select VIDEOBUF_VMALLOC 4 select VIDEOBUF2_VMALLOC
5 default n 5 default n
6 help 6 help
7 Say Y here if you want support for the Sensoray 2255 USB device. 7 Say Y here if you want support for the Sensoray 2255 USB device.