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: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
index d74c5cddb98b..3bb8e56969a5 100644
--- a/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@ -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));