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-mx3 | |
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-mx3')
-rw-r--r-- | arch/arm/mach-mx3/pcm037.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-mx3/pcm043.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c index 1b9140e23033..b1b3282d15d3 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c | |||
@@ -339,8 +339,7 @@ static struct i2c_board_info pcm037_i2c_devices[] = { | |||
339 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ | 339 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ |
340 | .platform_data = &board_eeprom, | 340 | .platform_data = &board_eeprom, |
341 | }, { | 341 | }, { |
342 | I2C_BOARD_INFO("rtc-pcf8563", 0x51), | 342 | I2C_BOARD_INFO("pcf8563", 0x51), |
343 | .type = "pcf8563", | ||
344 | } | 343 | } |
345 | }; | 344 | }; |
346 | 345 | ||
diff --git a/arch/arm/mach-mx3/pcm043.c b/arch/arm/mach-mx3/pcm043.c index 7c7d3cc07b89..e43276ea3b7f 100644 --- a/arch/arm/mach-mx3/pcm043.c +++ b/arch/arm/mach-mx3/pcm043.c | |||
@@ -133,8 +133,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = { | |||
133 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ | 133 | I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ |
134 | .platform_data = &board_eeprom, | 134 | .platform_data = &board_eeprom, |
135 | }, { | 135 | }, { |
136 | I2C_BOARD_INFO("rtc-pcf8563", 0x51), | 136 | I2C_BOARD_INFO("pcf8563", 0x51), |
137 | .type = "pcf8563", | ||
138 | } | 137 | } |
139 | }; | 138 | }; |
140 | #endif | 139 | #endif |