Robert Jarzmik <robert.jarzmik@xxxxxxx> writes: > As the conversion to a v4l2 standalone device is finished, move > pxa_camera one directory up and finish severing any dependency to > soc_camera. > diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig > index 0bf33ccf9a1e..10f49214b521 100644 > --- a/drivers/media/platform/soc_camera/Kconfig > +++ b/drivers/media/platform/soc_camera/Kconfig > @@ -25,8 +25,8 @@ config VIDEO_PXA27x > ---help--- > This is a v4l2 driver for the PXA27x Quick Capture Interface > > -config VIDEO_RCAR_VIN_OLD > - tristate "R-Car Video Input (VIN) support (DEPRECATED)" > +config VIDEO_RCAR_VIN > + tristate "R-Car Video Input (VIN) support" > depends on VIDEO_DEV && SOC_CAMERA > depends on ARCH_RENESAS || COMPILE_TEST > depends on HAS_DMA This is wrong, looks like a rebase error, where instead of removing the VIDEO_PXA27x config parameter I modify an RCAR_VIN one. I will fix that for next iteration. Cheers. -- Robert -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
