1 files changed, 9 insertions, 2 deletions

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 76014f8f3c60..365e0df3646b 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,                                       \