diff options
author | Rob Alley <rob.alley@navmanwireless.com> | 2010-03-10 20:15:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-13 05:48:21 -0500 |
commit | 438ff39d7813515d3aac20f53b5b95aaa58b38f9 (patch) | |
tree | 68b22f32bc7abd06bd7384317754236587940afe /arch/arm/mach-at91 | |
parent | a2302b45d8ab41a55e84c39a6c6f813586ad8493 (diff) |
ARM: 5986/1: at91sam9g20-ek: Correct braces in I2C registration code
The change introduced in patch 5596/1 used incorrect bracing which
resulted in the AT24 EEPROM no longer being registered. This patch
corrects the bracing and allows both the WM8731 audio device and AT24
EEPROM device to be registered.
Signed-off-by: Rob Alley <rob.alley@navmanwireless.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 29cf83177484..c11fd47aec5d 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -271,10 +271,12 @@ static void __init ek_add_device_buttons(void) {} | |||
271 | 271 | ||
272 | 272 | ||
273 | static struct i2c_board_info __initdata ek_i2c_devices[] = { | 273 | static struct i2c_board_info __initdata ek_i2c_devices[] = { |
274 | { | 274 | { |
275 | I2C_BOARD_INFO("24c512", 0x50), | 275 | I2C_BOARD_INFO("24c512", 0x50) |
276 | I2C_BOARD_INFO("wm8731", 0x1b), | 276 | }, |
277 | }, | 277 | { |
278 | I2C_BOARD_INFO("wm8731", 0x1b) | ||
279 | }, | ||
278 | }; | 280 | }; |
279 | 281 | ||
280 | 282 | ||