projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9143019
)
[ARM] Fix omap_h2_1610_defconfig regressions
author
Russell King
<
[email protected]
>
Fri, 26 Oct 2007 15:33:31 +0000
(16:33 +0100)
committer
Russell King
<
[email protected]
>
Wed, 31 Oct 2007 15:21:34 +0000
(15:21 +0000)
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 <
[email protected]
>
Signed-off-by: Russell King <
[email protected]
>
arch/arm/mach-omap1/board-h2.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap1/board-h2.c
b/arch/arm/mach-omap1/board-h2.c
index b0921622566f34c1745cd9f28bff45f81f334780..130681201c19266d17d66f2c1a6faa5371809268 100644
(file)
--- 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 = {
&h2_mcbsp1_device,
};
+#ifdef CONFIG_I2C_BOARDINFO
static struct i2c_board_info __initdata h2_i2c_board_info[] = {
{
I2C_BOARD_INFO("tps65010", 0x48),
@@
-356,6
+357,7
@@
static struct i2c_board_info __initdata h2_i2c_board_info[] = {
* - ... etc
*/
};
+#endif
static void __init h2_init_smc91x(void)
{
@@
-467,8
+469,10
@@
static void __init h2_init(void)
if (gpio_request(58, "tps65010") == 0)
gpio_direction_input(58);
+#ifdef CONFIG_I2C_BOARDINFO
i2c_register_board_info(1, h2_i2c_board_info,
ARRAY_SIZE(h2_i2c_board_info));
+#endif
}
static void __init h2_map_io(void)