diff options
author | Olof Johansson <olof@lixom.net> | 2012-06-07 14:59:28 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-06-07 14:59:28 -0700 |
commit | 6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40 (patch) | |
tree | 4277ede78d08047ab1ab92cda179da7e40a357a7 /arch/arm/mach-imx/mach-cpuimx35.c | |
parent | 434978e678605c8370d3d71e88796c264f70a8bf (diff) | |
parent | 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a (diff) | |
download | linux-rt-6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40.tar.gz |
Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
* 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX imx21ads: Fix overlapping static i/o mappings
ARM i.MX27 Visstrim M10: fix gpio handling.
ARM: imx: only call l2x0_init if it's available
ARM: imx: only specify i2c device type once
ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx35.c')
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx35.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index c515f8ede1a1..6450303f1a7a 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c @@ -70,7 +70,6 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { I2C_BOARD_INFO("pcf8563", 0x51), }, { I2C_BOARD_INFO("tsc2007", 0x48), - .type = "tsc2007", .platform_data = &tsc2007_info, .irq = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO), }, |