The following commit has been merged in the linux branch: commit 3d977c012f1af4a867939fa21ad502d5279fa0a0 Author: Hartley Sweeten hartleys@visionengravers.com Date: Wed Oct 14 01:56:10 2009 +0100

ARM: 5760/1: ep93xx: fix build error in edb93xx.c

Fix a build error due to a typo (missing comma) in:

ARM: 5754/1: ep93xx: update i2c support

Signed-off-by: H Hartley Sweeten hsweeten@visionengravers.com Acked-by: Ryan Mallon ryan@bluewatersys.com Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index ca71cf1..a4a7be3 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -112,7 +112,7 @@ static void __init edb93xx_register_i2c(void) ARRAY_SIZE(edb93xxa_i2c_board_info)); } else if (machine_is_edb9307() || machine_is_edb9312() || machine_is_edb9315()) { - ep93xx_register_i2c(&edb93xx_i2c_gpio_data + ep93xx_register_i2c(&edb93xx_i2c_gpio_data, edb93xx_i2c_board_info, ARRAY_SIZE(edb93xx_i2c_board_info)); }