diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-03-23 20:05:33 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-03-23 20:10:52 -0700 |
| commit | ad3fef79873eeacc8a6337d95df125e81df0a0a2 (patch) | |
| tree | 9c421453d1bd522f00942c6ee27c7a20b3269836 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 89f6f0211edb9e6c4e5ecafbf1c3581134117e53 (diff) | |
| parent | a734d0a9d2b31af6e583b74153081d058abe0e8c (diff) | |
| download | olio-linux-3.10-ad3fef79873eeacc8a6337d95df125e81df0a0a2.tar.xz olio-linux-3.10-ad3fef79873eeacc8a6337d95df125e81df0a0a2.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into mattis_dev
Change-Id: I7b6e248dea163a73056513b14f1cd401bba95ed6
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 5505b893ddc..6270437b4d2 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -536,9 +536,13 @@ static int __init omap3_h1_i2c_init(void) omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info)); #ifdef CONFIG_MACH_OMAP3_H1_DVT2 omap_register_i2c_bus(2, 400, omap3h1_i2c2_board_info, ARRAY_SIZE(omap3h1_i2c2_board_info)); +#else + omap_register_i2c_bus(2, 400, NULL, 0); #endif #ifdef CONFIG_MACH_OMAP3_H1_EVT1 omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info)); +#else + omap_register_i2c_bus(3, 400, NULL, 0); #endif return 0; } |