diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-20 02:18:47 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-14 06:40:37 -0400 |
commit | cf87a6e2fe95891575c45ba1a0ecb8cf53c09732 (patch) | |
tree | 569cb46eccc3b23b14fca040a8e505574bf053b0 /arch/arm/mach-mx1 | |
parent | a961bf380b93741c2191f8efc8f5f1c65224b216 (diff) |
ARM: mxc: Fix i2c_board_info definitions
Fix i2c_board_info definitions - we were defining the 'type' field
of these structures twice since the first argument of I2C_BOARD_INFO
sets this field. Move the second definition into I2C_BOARD_INFO().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'arch/arm/mach-mx1')
-rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c index 6af064d19b0f..30f04e56fafe 100644 --- a/arch/arm/mach-mx1/mx1ads.c +++ b/arch/arm/mach-mx1/mx1ads.c | |||
@@ -104,12 +104,10 @@ static struct imxi2c_platform_data mx1ads_i2c_data = { | |||
104 | 104 | ||
105 | static struct i2c_board_info mx1ads_i2c_devices[] = { | 105 | static struct i2c_board_info mx1ads_i2c_devices[] = { |
106 | { | 106 | { |
107 | I2C_BOARD_INFO("pcf857x", 0x22), | 107 | I2C_BOARD_INFO("pcf8575", 0x22), |
108 | .type = "pcf8575", | ||
109 | .platform_data = &pcf857x_data[0], | 108 | .platform_data = &pcf857x_data[0], |
110 | }, { | 109 | }, { |
111 | I2C_BOARD_INFO("pcf857x", 0x24), | 110 | I2C_BOARD_INFO("pcf8575", 0x24), |
112 | .type = "pcf8575", | ||
113 | .platform_data = &pcf857x_data[1], | 111 | .platform_data = &pcf857x_data[1], |
114 | }, | 112 | }, |
115 | }; | 113 | }; |