]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
i2c: Make i2c_register_board_info() a NOP when CONFIG_I2C_BOARDINFO=n
authorDavid Brownell <david-b@pacbell.net>
Sun, 24 Feb 2008 19:03:42 +0000 (20:03 +0100)
committerJean Delvare <khali@hyperion.delvare>
Sun, 24 Feb 2008 19:03:42 +0000 (20:03 +0100)
Don't require platform code to be #ifdeffed according to whether
I2C is enabled or not ... if it's not enabled, let GCC compile out
all I2C device declarations.  (Issue noted on an NSLU2 build that
didn't configure I2C.)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
include/linux/i2c.h

index 2d1c608eb5db856880af3534ac81e9b06c43a857..365e0df3646baf525d94aaec7899fa93a8f2a05c 100644 (file)
@@ -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: