| From fc88dd16a0e430f57458e6bd9b62a631c6ea53a1 Mon Sep 17 00:00:00 2001 |
| From: Hans Verkuil <hverkuil@xs4all.nl> |
| Date: Mon, 21 Sep 2015 08:42:04 -0300 |
| Subject: [media] cobalt: fix Kconfig dependency |
| |
| From: Hans Verkuil <hverkuil@xs4all.nl> |
| |
| commit fc88dd16a0e430f57458e6bd9b62a631c6ea53a1 upstream. |
| |
| The cobalt driver should depend on VIDEO_V4L2_SUBDEV_API. |
| |
| This fixes this kbuild error: |
| |
| tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master |
| head: 99bc7215bc60f6cd414cf1b85cd9d52cc596cccb |
| commit: 85756a069c55e0315ac5990806899cfb607b987f [media] cobalt: add new driver |
| config: x86_64-randconfig-s0-09201514 (attached as .config) |
| reproduce: |
| git checkout 85756a069c55e0315ac5990806899cfb607b987f |
| # save the attached .config to linux build tree |
| make ARCH=x86_64 |
| |
| All error/warnings (new ones prefixed by >>): |
| |
| drivers/media/i2c/adv7604.c: In function 'adv76xx_get_format': |
| >> drivers/media/i2c/adv7604.c:1853:9: error: implicit declaration of function 'v4l2_subdev_get_try_format' [-Werror=implicit-function-declaration] |
| fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); |
| ^ |
| drivers/media/i2c/adv7604.c:1853:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] |
| fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); |
| ^ |
| drivers/media/i2c/adv7604.c: In function 'adv76xx_set_format': |
| drivers/media/i2c/adv7604.c:1882:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] |
| fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); |
| ^ |
| cc1: some warnings being treated as errors |
| |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/pci/cobalt/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/media/pci/cobalt/Kconfig |
| +++ b/drivers/media/pci/cobalt/Kconfig |
| @@ -1,6 +1,6 @@ |
| config VIDEO_COBALT |
| tristate "Cisco Cobalt support" |
| - depends on VIDEO_V4L2 && I2C && MEDIA_CONTROLLER |
| + depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API |
| depends on PCI_MSI && MTD_COMPLEX_MAPPINGS |
| depends on GPIOLIB || COMPILE_TEST |
| depends on SND |
