Commit 913bdf12 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx...

Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical

From Ryan Mallon <ryanm@ok-labs.com>:

* tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx:
  arm: ep93xx: Enable i2c support for ep9302
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86cc0ef8 688df8f0
...@@ -91,8 +91,8 @@ static void __init edb93xx_register_i2c(void) ...@@ -91,8 +91,8 @@ static void __init edb93xx_register_i2c(void)
ep93xx_register_i2c(&edb93xx_i2c_gpio_data, ep93xx_register_i2c(&edb93xx_i2c_gpio_data,
edb93xxa_i2c_board_info, edb93xxa_i2c_board_info,
ARRAY_SIZE(edb93xxa_i2c_board_info)); ARRAY_SIZE(edb93xxa_i2c_board_info));
} else if (machine_is_edb9307() || machine_is_edb9312() || } else if (machine_is_edb9302() || machine_is_edb9307()
machine_is_edb9315()) { || machine_is_edb9312() || machine_is_edb9315()) {
ep93xx_register_i2c(&edb93xx_i2c_gpio_data, ep93xx_register_i2c(&edb93xx_i2c_gpio_data,
edb93xx_i2c_board_info, edb93xx_i2c_board_info,
ARRAY_SIZE(edb93xx_i2c_board_info)); ARRAY_SIZE(edb93xx_i2c_board_info));
......
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