diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-26 11:33:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-31 11:21:34 -0400 |
commit | b23e79fd87529706eb8e9e350226465b4abe70d2 (patch) | |
tree | 166d1c236b61479a102b1e8edaa404d7a6e362b5 /arch/arm | |
parent | 914301982f38e5842b28fd2f708208ea456b346a (diff) |
[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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index b0921622566f..130681201c19 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -343,6 +343,7 @@ static struct platform_device *h2_devices[] __initdata = { | |||
343 | &h2_mcbsp1_device, | 343 | &h2_mcbsp1_device, |
344 | }; | 344 | }; |
345 | 345 | ||
346 | #ifdef CONFIG_I2C_BOARDINFO | ||
346 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { | 347 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { |
347 | { | 348 | { |
348 | I2C_BOARD_INFO("tps65010", 0x48), | 349 | I2C_BOARD_INFO("tps65010", 0x48), |
@@ -356,6 +357,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = { | |||
356 | * - ... etc | 357 | * - ... etc |
357 | */ | 358 | */ |
358 | }; | 359 | }; |
360 | #endif | ||
359 | 361 | ||
360 | static void __init h2_init_smc91x(void) | 362 | static void __init h2_init_smc91x(void) |
361 | { | 363 | { |
@@ -467,8 +469,10 @@ static void __init h2_init(void) | |||
467 | if (gpio_request(58, "tps65010") == 0) | 469 | if (gpio_request(58, "tps65010") == 0) |
468 | gpio_direction_input(58); | 470 | gpio_direction_input(58); |
469 | 471 | ||
472 | #ifdef CONFIG_I2C_BOARDINFO | ||
470 | i2c_register_board_info(1, h2_i2c_board_info, | 473 | i2c_register_board_info(1, h2_i2c_board_info, |
471 | ARRAY_SIZE(h2_i2c_board_info)); | 474 | ARRAY_SIZE(h2_i2c_board_info)); |
475 | #endif | ||
472 | } | 476 | } |
473 | 477 | ||
474 | static void __init h2_map_io(void) | 478 | static void __init h2_map_io(void) |