Commit b23e79fd authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Fix omap_h2_1610_defconfig regressions

Fix:

arch/arm/mach-omap1/built-in.o: In function `h2_init':
board-h2.c:(.init.text+0xbb4): undefined reference to `i2c_register_board_info'
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 91430198
...@@ -343,6 +343,7 @@ static struct platform_device *h2_devices[] __initdata = { ...@@ -343,6 +343,7 @@ static struct platform_device *h2_devices[] __initdata = {
&h2_mcbsp1_device, &h2_mcbsp1_device,
}; };
#ifdef CONFIG_I2C_BOARDINFO
static struct i2c_board_info __initdata h2_i2c_board_info[] = { static struct i2c_board_info __initdata h2_i2c_board_info[] = {
{ {
I2C_BOARD_INFO("tps65010", 0x48), I2C_BOARD_INFO("tps65010", 0x48),
...@@ -356,6 +357,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = { ...@@ -356,6 +357,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = {
* - ... etc * - ... etc
*/ */
}; };
#endif
static void __init h2_init_smc91x(void) static void __init h2_init_smc91x(void)
{ {
...@@ -467,8 +469,10 @@ static void __init h2_init(void) ...@@ -467,8 +469,10 @@ static void __init h2_init(void)
if (gpio_request(58, "tps65010") == 0) if (gpio_request(58, "tps65010") == 0)
gpio_direction_input(58); gpio_direction_input(58);
#ifdef CONFIG_I2C_BOARDINFO
i2c_register_board_info(1, h2_i2c_board_info, i2c_register_board_info(1, h2_i2c_board_info,
ARRAY_SIZE(h2_i2c_board_info)); ARRAY_SIZE(h2_i2c_board_info));
#endif
} }
static void __init h2_map_io(void) static void __init h2_map_io(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment