[i2c] [patch 2.6.25-rc2-git] make i2c_register_board_info() a NOP when CONFIG_I2C=n
David Brownell
david-b at pacbell.net
Fri Feb 22 09:23:16 CET 2008
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 at users.sourceforge.net>
---
include/linux/i2c.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- at91.orig/include/linux/i2c.h 2008-02-21 22:58:53.000000000 -0800
+++ at91/include/linux/i2c.h 2008-02-21 23:02:57.000000000 -0800
@@ -271,9 +271,16 @@ extern void i2c_unregister_device(struct
* This is done at arch_initcall time, before declaring any i2c adapters.
* Modules for add-on boards must use other calls.
*/
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
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:
More information about the i2c
mailing list