From 18311c5395ca4d0c3fefa406da87a9d16efaca46 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 18 Apr 2012 03:59:01 -0300
Subject: [media] V4L: mt9m032: fix compilation breakage

Fix the following compilation failure:

linux-2.6/drivers/media/video/mt9m032.c: In function '__mt9m032_get_pad_crop':
linux-2.6/drivers/media/video/mt9m032.c:337: error: implicit declaration of function 'v4l2_subdev_get_try_crop'
linux-2.6/drivers/media/video/mt9m032.c:337: warning: return makes pointer from integer without a cast
linux-2.6/drivers/media/video/mt9m032.c: In function '__mt9m032_get_pad_format':
linux-2.6/drivers/media/video/mt9m032.c:359: error: implicit declaration of function 'v4l2_subdev_get_try_format'
linux-2.6/drivers/media/video/mt9m032.c:359: warning: return makes pointer from integer without a cast
linux-2.6/drivers/media/video/mt9m032.c: In function 'mt9m032_probe':
linux-2.6/drivers/media/video/mt9m032.c:767: error: 'struct v4l2_subdev' has no member named 'entity'
linux-2.6/drivers/media/video/mt9m032.c:826: error: 'struct v4l2_subdev' has no member named 'entity'
linux-2.6/drivers/media/video/mt9m032.c: In function 'mt9m032_remove':
linux-2.6/drivers/media/video/mt9m032.c:842: error: 'struct v4l2_subdev' has no member named 'entity'
make[4]: *** [drivers/media/video/mt9m032.o] Error 1

by adding a dependency on VIDEO_V4L2_SUBDEV_API.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 drivers/media/video/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f2479c5c0eb2..ce1e7ba940f6 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -492,7 +492,7 @@ config VIDEO_VS6624
 
 config VIDEO_MT9M032
 	tristate "MT9M032 camera sensor support"
-	depends on I2C && VIDEO_V4L2
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 	select VIDEO_APTINA_PLL
 	---help---
 	  This driver supports MT9M032 camera sensors from Aptina, monochrome
-- 
cgit v1.2.3

msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/linux/log/?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>root</a>/<a href='/linux/log/tools?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>tools</a>/<a href='/linux/log/tools/perf?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>perf</a>/<a href='/linux/log/tools/perf/scripts?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>scripts</a>/<a href='/linux/log/tools/perf/scripts/python?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>python</a>/<a href='/linux/log/tools/perf/scripts/python/stackcollapse.py?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;follow=1'>stackcollapse.py</a> (<a href='/linux/log/tools/perf/scripts/python/stackcollapse.py?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/linux/log/tools/perf/scripts/python/stackcollapse.py?id=5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr><td><span title='2019-01-23 16:29:54 +0900'>2019-01-23</span></td><td><a href='/linux/commit/net/9p/trans_xen.c?id=3bbe8b1a4ae9585e9cf15e7036bf9e5374a482df&amp;follow=1'>9p: mark expected switch fall-through</a></td><td>Gustavo A. R. Silva</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-21 13:14:44 +1300'>2019-01-21</span></td><td><a href='/linux/commit/Makefile?id=49a57857aeea06ca831043acbb0fa5e0f50602fd&amp;follow=1'>Linux 5.0-rc3</a><span class='decoration'><a class='tag-annotated-deco' href='/linux/tag/?h=v5.0-rc3'>v5.0-rc3</a></span></td><td>Linus Torvalds</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-20 14:44:52 -0800'>2019-01-20</span></td><td><a href='/linux/commit/fs/pstore/ram.c?id=5631e8576a3caf606cdc375f97425a67983b420c&amp;follow=1'>pstore/ram: Avoid allocation and leak of platform data</a></td><td>Kees Cook</td><td>1</td><td><span class='deletions'>-6</span>/<span class='insertions'>+3</span></td></tr>
<tr><td><span title='2019-01-20 14:06:40 -0800'>2019-01-20</span></td><td><a href='/linux/commit/scripts/gcc-plugins/arm_ssp_per_task_plugin.c?id=2c88c742d011707b55da7b54b06a030c6f57233f&amp;follow=1'>gcc-plugins: arm_ssp_per_task_plugin: fix for GCC 9+</a></td><td>Ard Biesheuvel</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+18</span></td></tr>
<tr><td><span title='2019-01-20 14:06:40 -0800'>2019-01-20</span></td><td><a href='/linux/commit/scripts/gcc-plugins/arm_ssp_per_task_plugin.c?id=560706d5d2589ef510f5436d69ab510a351b8cf7&amp;follow=1'>gcc-plugins: arm_ssp_per_task_plugin: sign extend the SP mask</a></td><td>Ard Biesheuvel</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+3</span></td></tr>
<tr><td><span title='2019-01-21 07:20:18 +1300'>2019-01-21</span></td><td><a href='/linux/commit/lib/int_sqrt.c?id=fbfaf851902cd9293f392f3a1735e0543016d530&amp;follow=1'>fix int_sqrt64() for very large numbers</a></td><td>Florian La Roche</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-20 15:33:22 +1200'>2019-01-20</span></td><td><a href='/linux/commit/arch/x86/include/asm/uaccess.h?id=6e693b3ffecb0b478c7050b44a4842854154f715&amp;follow=1'>x86: uaccess: Inhibit speculation past access_ok() in user_access_begin()</a></td><td>Will Deacon</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-20 01:11:48 +0100'>2019-01-20</span></td><td><a href='/linux/commit/net/core/lwt_bpf.c?id=e7c87bd6cc4ec7b0ac1ed0a88a58f8206c577488&amp;follow=1'>bpf: in __bpf_redirect_no_mac pull mac only if present</a></td><td>Willem de Bruijn</td><td>2</td><td><span class='deletions'>-10</span>/<span class='insertions'>+12</span></td></tr>
<tr><td><span title='2019-01-19 16:06:52 -0800'>2019-01-19</span></td><td><a href='/linux/commit/drivers/net/virtio_net.c?id=df133f3f96257ee29696c0ed8bd198ec801dc810&amp;follow=1'>virtio_net: bulk free tx skbs</a></td><td>Michael S. Tsirkin</td><td>1</td><td><span class='deletions'>-6</span>/<span class='insertions'>+6</span></td></tr>
<tr><td><span title='2019-01-19 19:26:06 +0100'>2019-01-19</span></td><td><a href='/linux/commit/.clang-format?id=99e309b6ed75fab4a43afd9e523441ecc5a1f511&amp;follow=1'>clang-format: Update .clang-format with the latest for_each macro list</a></td><td>Jason Gunthorpe</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+42</span></td></tr>
<tr><td><span title='2019-01-19 10:03:08 -0800'>2019-01-19</span></td><td><a href='/linux/commit/include/linux/phy.h?id=3e64cf7a435ed0500e3adaa8aada2272d3ae8abc&amp;follow=1'>net: phy: phy driver features are mandatory</a></td><td>Camelia Groza</td><td>2</td><td><span class='deletions'>-2</span>/<span class='insertions'>+7</span></td></tr>
<tr><td><span title='2019-01-19 10:01:03 -0800'>2019-01-19</span></td><td><a href='/linux/commit/drivers/isdn/hardware/avm/b1.c?id=7afa81c55fca0cad589722cb4bce698b4803b0e1&amp;follow=1'>isdn: avm: Fix string plus integer warning from Clang</a></td><td>Nathan Chancellor</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-19 10:35:42 -0600'>2019-01-19</span></td><td><a href='/linux/commit/arch/powerpc/platforms/chrp/setup.c?id=75a080cde08d2dcba19ee864f9732094d93fab41&amp;follow=1'>powerpc: chrp: Use of_node_is_type to access device_type</a></td><td>Rob Herring</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-18 16:15:31 -0800'>2019-01-18</span></td><td><a href='/linux/commit/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=25f2d0e7791e71cc89c58a7c2231768ad200764b&amp;follow=1'>net/mlx5e: Fix cb_ident duplicate in indirect block register</a></td><td>Eli Britstein</td><td>1</td><td><span class='deletions'>-13</span>/<span class='insertions'>+16</span></td></tr>
<tr><td><span title='2019-01-18 16:15:31 -0800'>2019-01-18</span></td><td><a href='/linux/commit/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id=7fdc1adc52d3975740547a78c2df329bb207f15d&amp;follow=1'>net/mlx5e: Fix wrong (zero) TX drop counter indication for representor</a></td><td>Tariq Toukan</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-18 16:15:30 -0800'>2019-01-18</span></td><td><a href='/linux/commit/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id=2eb1e42551a8128d9182480dfaea52fa861e26e8&amp;follow=1'>net/mlx5e: Fix wrong error code return on FEC query failure</a></td><td>Shay Agroskin</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+4</span></td></tr>
<tr><td><span title='2019-01-18 16:15:30 -0800'>2019-01-18</span></td><td><a href='/linux/commit/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id=e8c8b53ccaff568fef4c13a6ccaf08bf241aa01a&amp;follow=1'>net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames</a></td><td>Cong Wang</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+13</span></td></tr>
<tr><td><span title='2019-01-18 15:26:54 -0800'>2019-01-18</span></td><td><a href='/linux/commit/tools/bpf/bpftool/json_writer.h?id=64cf5481262b9664ae3cdcb333f4a06af3e8fb58&amp;follow=1'>tools: bpftool: Cleanup license mess</a></td><td>Thomas Gleixner</td><td>2</td><td><span class='deletions'>-11</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2019-01-18 15:19:56 -0800'>2019-01-18</span></td><td><a href='/linux/commit/kernel/bpf/map_in_map.c?id=9d5564ddcf2a0f5ba3fa1c3a1f8a1b59ad309553&amp;follow=1'>bpf: fix inner map masking to prevent oob under speculation</a></td><td>Daniel Borkmann</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+15</span></td></tr>