diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-02-26 15:25:37 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-02-26 15:25:37 -0800 |
| commit | 01388c8b2f25dca19d532c361d38fcea9344789a (patch) | |
| tree | 0d9df7f65885b91032feb4a20ddf544730366554 | |
| parent | fce426b147a44cd1035bd6f95c4083444493cde1 (diff) | |
| parent | f529b98e2f235062c6660b19a8831ab49b63ace1 (diff) | |
| download | olio-linux-3.10-01388c8b2f25dca19d532c361d38fcea9344789a.tar.xz olio-linux-3.10-01388c8b2f25dca19d532c361d38fcea9344789a.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into mattis_dev
Conflicts:
arch/arm/mach-omap2/board-omap3h1.c
Change-Id: I0dca97c198de73582ecb07c75793f5a163d3a7c3
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 38020036780..e2efe2682a3 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -477,12 +477,19 @@ static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = { I2C_BOARD_INFO("mXT224", 0x4a), .platform_data = &mxt_data, }, +#ifndef CONFIG_MACH_OMAP3_H1_EVT1 { I2C_BOARD_INFO("bq274xx", 0x55), }, +#endif }; static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = { + #ifdef CONFIG_MACH_OMAP3_H1_EVT1 + { + I2C_BOARD_INFO("bq274xx", 0x55), + }, + #endif }; |