diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /include/linux/i2c.h | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 76014f8f3c6..365e0df3646 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -271,9 +271,16 @@ extern void i2c_unregister_device(struct i2c_client *); * This is done at arch_initcall time, before declaring any i2c adapters. * Modules for add-on boards must use other calls. */ +#ifdef CONFIG_I2C_BOARDINFO extern int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned n); - +#else +static inline int +i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned n) +{ + return 0; +} +#endif /* * The following structs are for those who like to implement new bus drivers: @@ -598,7 +605,7 @@ I2C_CLIENT_MODULE_PARM(probe, "List of adapter,address pairs to scan " \ "additionally"); \ I2C_CLIENT_MODULE_PARM(ignore, "List of adapter,address pairs not to " \ "scan"); \ -const static struct i2c_client_address_data addr_data = { \ +static const struct i2c_client_address_data addr_data = { \ .normal_i2c = normal_i2c, \ .probe = probe, \ .ignore = ignore, \ |