Re: 2.6.25 regression: VIDEO_DEV=y/m, I2C=n compile error

[Mauro Carvalho Chehab <mchehab@infradead.org>]

Hi Adrian and Marcin,

On Sun, 27 Jan 2008 20:52:16 +0200
Adrian Bunk <bunk@kernel.org> wrote:

> Commit 8ffbc6559493c64d6194c92d856196fdaeb8a5fb causes the following 
> compile error with CONFIG_VIDEO_DEV=y/m, CONFIG_I2C=n:
> 
> <--  snip  -->
> 
> ...
>   MODPOST 26 modules
> ERROR: "i2c_attach_client" [drivers/media/video/v4l2-common.ko] undefined!
> make[2]: *** [__modpost] Error 1
> 
> <--  snip  -->


Thanks for getting this regression. Please test the enclosed patch.


Cheers,
Mauro

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff -r b0815101889d linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c	Sun Jan 27 20:39:00 2008
-0200 +++ b/linux/drivers/media/video/v4l2-common.c	Sun Jan 27 22:23:25
2008 -0200 @@ -1585,6 +1585,7 @@ u32 v4l2_ctrl_next(const u32 * const * c
 	return **ctrl_classes;
 }
 
+#ifdef CONFIG_I2C
 int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32
match_chip) {
 	switch (match_type) {
@@ -1596,6 +1597,7 @@ int v4l2_chip_match_i2c_client(struct i2
 		return 0;
 	}
 }
+EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
 
 int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident
*chip, u32 ident, u32 revision)
@@ -1612,6 +1614,7 @@ int v4l2_chip_ident_i2c_client(struct i2
 	}
 	return 0;
 }
+EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
 
 int v4l2_chip_match_host(u32 match_type, u32 match_chip)
 {
@@ -1622,6 +1625,7 @@ int v4l2_chip_match_host(u32 match_type,
 		return 0;
 	}
 }
+EXPORT_SYMBOL(v4l2_chip_match_host);
 
 /* ----------------------------------------------------------------- */
 
@@ -1656,6 +1660,8 @@ int v4l2_i2c_attach(struct i2c_adapter *
 	}
 	return err != -ENOMEM ? 0 : err;
 }
+EXPORT_SYMBOL(v4l2_i2c_attach);
+#endif
 
 /* ----------------------------------------------------------------- */
 
@@ -1679,15 +1685,3 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 EXPORT_SYMBOL(v4l2_ctrl_query_fill);
 EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
-
-EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
-EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
-EXPORT_SYMBOL(v4l2_chip_match_host);
-
-EXPORT_SYMBOL(v4l2_i2c_attach);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */