diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /arch/arm/mach-imx/mach-cpuimx51sd.c | |
| parent | 707ecec1dc80d54163356a25d145c62083e7be60 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx51sd.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx51sd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c index ac50f1671e38..1e09de50cbcd 100644 --- a/arch/arm/mach-imx/mach-cpuimx51sd.c +++ b/arch/arm/mach-imx/mach-cpuimx51sd.c | |||
| @@ -142,7 +142,6 @@ static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = { | |||
| 142 | I2C_BOARD_INFO("pcf8563", 0x51), | 142 | I2C_BOARD_INFO("pcf8563", 0x51), |
| 143 | }, { | 143 | }, { |
| 144 | I2C_BOARD_INFO("tsc2007", 0x49), | 144 | I2C_BOARD_INFO("tsc2007", 0x49), |
| 145 | .type = "tsc2007", | ||
| 146 | .platform_data = &tsc2007_info, | 145 | .platform_data = &tsc2007_info, |
| 147 | }, | 146 | }, |
| 148 | }; | 147 | }; |