Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-ep93xx/edb93xx.c

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static void __init edb93xx_register_i2c(void) 
		ep93xx_register_i2c(&edb93xx_i2c_gpio_data,

				    edb93xxa_i2c_board_info,

				    ARRAY_SIZE(edb93xxa_i2c_board_info));

	} else if (machine_is_edb9307() || machine_is_edb9312() ||

		   machine_is_edb9315()) {

	} else if (machine_is_edb9302() || machine_is_edb9307()

		|| machine_is_edb9312() || machine_is_edb9315()) {

		ep93xx_register_i2c(&edb93xx_i2c_gpio_data,

				    edb93xx_i2c_board_info,

				    ARRAY_SIZE(edb93xx_i2c_board_info));