Compile failure on linux-n900 branch -- MEDIA_CAMERA_SUPPORT needed for n900 compilation

Pavel Machek
2013-12-01T19:21:26Z

Hi!

I just hit this one:

CC arch/arm/mach-omap2/board-rx51-camera.o
In file included from arch/arm/mach-omap2/board-rx51-camera.c:34:0:
arch/arm/mach-omap2/../../../drivers/media/platform/omap3isp/isp.h: In
function 'isp_pad_buffer_type':
arch/arm/mach-omap2/../../../drivers/media/platform/omap3isp/isp.h:347:19:
error: 'const struct v4l2_subdev' has no member named 'entity'
arch/arm/mach-omap2/../../../drivers/media/platform/omap3isp/isp.h:350:12:
error: 'const struct v4l2_subdev' has no member named 'entity'
make[1]: *** [arch/arm/mach-omap2/board-rx51-camera.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
make: *** Waiting for unfinished jobs....
Command exited with non-zero status 2

Problem seems to be that isp.h expects CONFIG_MEDIA_CONTROLLER to be set,
but board-rx51-camera.c is always compiled. We could do

config MACH_NOKIA_RX51
bool "Nokia N900 (RX-51) phone"
- depends on ARCH_OMAP3
+ depends on ARCH_OMAP3 && MEDIA_CONTROLLER
default y
select OMAP_PACKAGE_CBB

...but that's cruel to the user. Would this be acceptable?

config MACH_NOKIA_RX51
bool "Nokia N900 (RX-51) phone"
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBB
+ select MEDIA_CONTROLLER
+ select MEDIA_CAMERA_SUPPORT

Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html