diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 17:43:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 17:43:05 +0200 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /arch/arm/mach-imx/mach-cpuimx27.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | Revert d88dca79d3852a3623f606f781e013d61486828a (diff) | |
| download | linux-2198a10b501fd4443430cb17e065a9e859cc58c9.tar.xz linux-2198a10b501fd4443430cb17e065a9e859cc58c9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
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 339150ab0ea5..6830afd1d2ba 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c @@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void) i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); - imx27_add_i2c_imx1(&cpuimx27_i2c1_data); + imx27_add_i2c_imx0(&cpuimx27_i2c1_data); platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |