diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-28 18:42:38 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-28 18:42:38 -0200 |
| commit | 84a4158b0160301a2d062591b86a6a33bdac2893 (patch) | |
| tree | 43838b6f7e7304e49185f743544cc03c80c1157e /linux/drivers | |
| parent | e183b1318d624a8c124c0f9ff44a82c2012b8201 (diff) | |
| download | mediapointer-dvb-s2-84a4158b0160301a2d062591b86a6a33bdac2893.tar.gz mediapointer-dvb-s2-84a4158b0160301a2d062591b86a6a33bdac2893.tar.bz2 | |
Partially revert changeset 7097:ed7daeb29425
From: Mauro Carvalho Chehab <mchehab@infradead.org>
An experimental, incomplete changeset were committed by mistake. Reverting it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index 690f9059c..04477421b 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -1585,7 +1585,6 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id) 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) { @@ -1597,7 +1596,6 @@ int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_c 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) @@ -1614,7 +1612,6 @@ int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident *chi } return 0; } -EXPORT_SYMBOL(v4l2_chip_ident_i2c_client); int v4l2_chip_match_host(u32 match_type, u32 match_chip) { @@ -1625,7 +1622,6 @@ int v4l2_chip_match_host(u32 match_type, u32 match_chip) return 0; } } -EXPORT_SYMBOL(v4l2_chip_match_host); /* ----------------------------------------------------------------- */ @@ -1660,8 +1656,6 @@ int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver } return err != -ENOMEM ? 0 : err; } -EXPORT_SYMBOL(v4l2_i2c_attach); -#endif /* ----------------------------------------------------------------- */ @@ -1685,3 +1679,15 @@ EXPORT_SYMBOL(v4l2_ctrl_get_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: + */ |