On Sunday 01 December 2013 21:01:13 Pavel Machek wrote:
> Hi!
>
> > board-rx51-camera.c is not part of mainline kernel and will
> > never be (due to DT migration). So maybe it could be better
> > to add #ifdef to board-rx51-camera.c. Keeping changes for
> > Makefile/Kconfig files is harder because of future
> > rebase...
>
> Ok, that makes sense.
>
> This breaks compilation, too, but I don't think I want to fix
> that.
>
> Example code (PVR_EXAMPLES) [N/m/y] (NEW)
>
> (Select Y to break compile).
>
> Thanks,
> Pavel
>
> ---
>
> Fix compilation in !CONFIG_MEDIA_CAMERA_SUPPORT case, and make
> it such that it is unlikely to cause merge conflicts later.
>
> Signed-off-by: Pavel Machek <pa...@ucw.cz>
>
> diff --git a/arch/arm/mach-omap2/board-rx51-camera.c
> b/arch/arm/mach-omap2/board-rx51-camera.c index
> 8b4b59a..bae2cc0 100644
> --- a/arch/arm/mach-omap2/board-rx51-camera.c
> +++ b/arch/arm/mach-omap2/board-rx51-camera.c
> @@ -31,6 +31,7 @@
>
> #include <asm/gpio.h>
>
> +#ifdef CONFIG_MEDIA_CAMERA_SUPPORT
> #include "../../../drivers/media/platform/omap3isp/isp.h"
> #include "../../../drivers/media/platform/omap3isp/ispreg.h"
>
> @@ -375,9 +376,11 @@ static struct isp_platform_data
> rx51_isp_platform_data = { { .dev_id = "2-0010"},
> .subdevs = rx51_camera_subdevs,
> };
> +#endif
>
> void __init rx51_camera_init(void)
> {
> +#ifdef CONFIG_MEDIA_CAMERA_SUPPORT
> if (rx51_camera_hw_init()) {
> printk(KERN_WARNING "%s: Unable to initialize camera\n",
> __func__);
> @@ -387,4 +390,5 @@ void __init rx51_camera_init(void)
> if (omap3_init_camera(&rx51_isp_platform_data) < 0)
> printk(KERN_WARNING "%s: Unable to register camera
platform
> " "device\n", __func__);
> +#endif
> }Thanks, I commited patch to linux-n900 tree. -- Pali Rohár pali.ro...@gmail.com
signature.asc
Description: This is a digitally signed message part.
