diff --git a/[refs] b/[refs]
index c06b3cb5f2a8..bc8424b8ee59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 104cb574feb3033299568483a3f68031f47e0d43
+refs/heads/master: 263867631ea02741baf878ca9faaf94b1563b9d7
diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
index 2d1c608eb5db..365e0df3646b 100644
--- a/trunk/include/linux/i2c.h
+++ b/trunk/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: