From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Move v4l_bound_align_image() outside of an #ifdef CONFIG_I2C block so that it is always built. Fixes a build error: vivi.c:(.text+0x48e26): undefined reference to `v4l_bound_align_image' Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> --- drivers/media/video/v4l2-common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- linux-next-20090612.orig/drivers/media/video/v4l2-common.c +++ linux-next-20090612/drivers/media/video/v4l2-common.c @@ -915,6 +915,7 @@ const unsigned short *v4l2_i2c_tuner_add return NULL; } EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs); +#endif /* Clamp x to be between min and max, aligned to a multiple of 2^align. min * and max don't have to be aligned, but there must be at least one valid @@ -986,5 +987,3 @@ void v4l_bound_align_image(u32 *w, unsig } } EXPORT_SYMBOL_GPL(v4l_bound_align_image); - -#endif -- ~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html