projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 68c7e618 GKH |
1 | From fc88dd16a0e430f57458e6bd9b62a631c6ea53a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hans Verkuil <hverkuil@xs4all.nl> | |
| 3 | Date: Mon, 21 Sep 2015 08:42:04 -0300 | |
| 4 | Subject: [media] cobalt: fix Kconfig dependency | |
| 5 | ||
| 6 | From: Hans Verkuil <hverkuil@xs4all.nl> | |
| 7 | ||
| 8 | commit fc88dd16a0e430f57458e6bd9b62a631c6ea53a1 upstream. | |
| 9 | ||
| 10 | The cobalt driver should depend on VIDEO_V4L2_SUBDEV_API. | |
| 11 | ||
| 12 | This fixes this kbuild error: | |
| 13 | ||
| 14 | tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master | |
| 15 | head: 99bc7215bc60f6cd414cf1b85cd9d52cc596cccb | |
| 16 | commit: 85756a069c55e0315ac5990806899cfb607b987f [media] cobalt: add new driver | |
| 17 | config: x86_64-randconfig-s0-09201514 (attached as .config) | |
| 18 | reproduce: | |
| 19 | git checkout 85756a069c55e0315ac5990806899cfb607b987f | |
| 20 | # save the attached .config to linux build tree | |
| 21 | make ARCH=x86_64 | |
| 22 | ||
| 23 | All error/warnings (new ones prefixed by >>): | |
| 24 | ||
| 25 | drivers/media/i2c/adv7604.c: In function 'adv76xx_get_format': | |
| 26 | >> drivers/media/i2c/adv7604.c:1853:9: error: implicit declaration of function 'v4l2_subdev_get_try_format' [-Werror=implicit-function-declaration] | |
| 27 | fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); | |
| 28 | ^ | |
| 29 | drivers/media/i2c/adv7604.c:1853:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] | |
| 30 | fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); | |
| 31 | ^ | |
| 32 | drivers/media/i2c/adv7604.c: In function 'adv76xx_set_format': | |
| 33 | drivers/media/i2c/adv7604.c:1882:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] | |
| 34 | fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad); | |
| 35 | ^ | |
| 36 | cc1: some warnings being treated as errors | |
| 37 | ||
| 38 | Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> | |
| 39 | Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> | |
| 40 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 41 | ||
| 42 | --- | |
| 43 | drivers/media/pci/cobalt/Kconfig | 2 +- | |
| 44 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 45 | ||
| 46 | --- a/drivers/media/pci/cobalt/Kconfig | |
| 47 | +++ b/drivers/media/pci/cobalt/Kconfig | |
| 48 | @@ -1,6 +1,6 @@ | |
| 49 | config VIDEO_COBALT | |
| 50 | tristate "Cisco Cobalt support" | |
| 51 | - depends on VIDEO_V4L2 && I2C && MEDIA_CONTROLLER | |
| 52 | + depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API | |
| 53 | depends on PCI_MSI && MTD_COMPLEX_MAPPINGS && GPIOLIB | |
| 54 | depends on SND | |
| 55 | select I2C_ALGOBIT |