diff --git a/[refs] b/[refs] index 073070e3bf8b..4f8a65e22e87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d56ae6fbf33ddeb7ab2ffac896229ca473a7457f +refs/heads/master: 86caf8113800cf4e4eedbeac222f3daa0fb146b5 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index aed5b3d740ca..b80bea26af62 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/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/trunk/drivers/media/video/mt9p031.c b/trunk/drivers/media/video/mt9p031.c index 5cfa39f4bf14..73c068993f05 100644 --- a/trunk/drivers/media/video/mt9p031.c +++ b/trunk/drivers/media/video/mt9p031.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include diff --git a/trunk/drivers/media/video/mt9t001.c b/trunk/drivers/media/video/mt9t001.c index cac14160b5c3..08074b8a2736 100644 --- a/trunk/drivers/media/video/mt9t001.c +++ b/trunk/drivers/media/video/mt9t001.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include