diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /arch/arm/mach-at91/board-afeb-9260v1.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/arm/mach-at91/board-afeb-9260v1.c')
| -rw-r--r-- | arch/arm/mach-at91/board-afeb-9260v1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index 9c040c78889a..e263fda3e2d1 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c | |||
| @@ -165,6 +165,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = { | |||
| 165 | static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { | 165 | static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { |
| 166 | { | 166 | { |
| 167 | I2C_BOARD_INFO("fm3130", 0x68), | 167 | I2C_BOARD_INFO("fm3130", 0x68), |
| 168 | }, { | ||
| 168 | I2C_BOARD_INFO("24c64", 0x50), | 169 | I2C_BOARD_INFO("24c64", 0x50), |
| 169 | }, | 170 | }, |
| 170 | }; | 171 | }; |