From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: mchehab@redhat.com
Cc: rdunlap@xenotime.net, sfr@canb.auug.org.au,
linux-next@vger.kernel.org, linux-media@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH] drivers/media: fix dependencies in video mt9t001/mt9p031
Date: Fri, 30 Sep 2011 17:34:51 -0400 [thread overview]
Message-ID: <1317418491-26513-1-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <4E83A02F.2020309@xenotime.net>
Both mt9t001.c and mt9p031.c have two identical issues, those
being that they will need module.h inclusion for the upcoming
cleanup going on there, and that their dependencies don't limit
selection of configs that will fail to compile as follows:
drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
The related config options are CONFIG_MEDIA_CONTROLLER and
CONFIG_VIDEO_V4L2_SUBDEV_API. Looking at the code, it appears
that the driver was never intended to work without these enabled,
so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 75e43c0..d285c8c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -469,14 +469,14 @@ config VIDEO_OV7670
config VIDEO_MT9P031
tristate "Aptina MT9P031 support"
- depends on I2C && VIDEO_V4L2
+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
---help---
This is a Video4Linux2 sensor-level driver for the Aptina
(Micron) mt9p031 5 Mpixel camera.
config VIDEO_MT9T001
tristate "Aptina MT9T001 support"
- depends on I2C && VIDEO_V4L2
+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
---help---
This is a Video4Linux2 sensor-level driver for the Aptina
(Micron) mt0t001 3 Mpixel camera.
diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c
index 8bcb1ce..fc9603f 100644
--- a/drivers/media/video/mt9p031.c
+++ b/drivers/media/video/mt9p031.c
@@ -14,6 +14,7 @@
#include <linux/delay.h>
#include <linux/device.h>
+#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/log2.h>
#include <linux/pm.h>
diff --git a/drivers/media/video/mt9t001.c b/drivers/media/video/mt9t001.c
index ae75d82..280d01d 100644
--- a/drivers/media/video/mt9t001.c
+++ b/drivers/media/video/mt9t001.c
@@ -13,6 +13,7 @@
*/
#include <linux/i2c.h>
+#include <linux/module.h>
#include <linux/log2.h>
#include <linux/slab.h>
#include <linux/videodev2.h>
--
1.7.6
next prev parent reply other threads:[~2011-09-30 21:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 10:04 linux-next: Tree for Sept 28 Stephen Rothwell
2011-09-28 22:11 ` linux-next: Tree for Sept 28 (mrst) Randy Dunlap
2011-12-05 18:39 ` Randy Dunlap
2011-12-05 18:41 ` Ingo Molnar
2011-12-05 19:10 ` Alan Cox
2011-09-28 22:29 ` linux-next: Tree for Sept 28 (media/video/mt9p031.c) Randy Dunlap
2011-09-28 22:31 ` Randy Dunlap
2011-09-30 21:34 ` Paul Gortmaker [this message]
2011-09-30 22:38 ` [PATCH] drivers/media: fix dependencies in video mt9t001/mt9p031 Randy Dunlap
2011-10-06 3:02 ` Stephen Rothwell
2011-10-08 10:52 ` Mauro Carvalho Chehab
2011-10-09 3:39 ` Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317418491-26513-1-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=rdunlap@xenotime.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).