diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
| commit | f779b7dd3259ec138c7aba793f0602b20262af83 (patch) | |
| tree | 7ed94961b196c81fcd413e2b04d1e6945d6d227a /arch/arm/mach-imx/mach-cpuimx27.c | |
| parent | 3c00079b31f910309b30ed5c2fd2b7a2d86bba60 (diff) | |
| parent | fe0cdec8bad919fd91cd344123906a55f3857209 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/mach-cpuimx27.c
AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx27.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 28f73a1c79f7..a1681fc9d9b0 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
| @@ -258,7 +258,7 @@ static void __init eukrea_cpuimx27_init(void) | |||
| 258 | i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, | 258 | i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, |
| 259 | ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); | 259 | ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); |
| 260 | 260 | ||
| 261 | imx27_add_imx_i2c(1, &cpuimx27_i2c1_data); | 261 | imx27_add_imx_i2c(0, &cpuimx27_i2c1_data); |
| 262 | 262 | ||
| 263 | imx27_add_fec(NULL); | 263 | imx27_add_fec(NULL); |
| 264 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 264 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |