Commit 64e8be6e authored by Russell King's avatar Russell King Committed by Russell King

ARM: Realview & Versatile: 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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
parent d740d347
...@@ -208,8 +208,7 @@ struct platform_device realview_i2c_device = { ...@@ -208,8 +208,7 @@ struct platform_device realview_i2c_device = {
static struct i2c_board_info realview_i2c_board_info[] = { static struct i2c_board_info realview_i2c_board_info[] = {
{ {
I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), I2C_BOARD_INFO("ds1338", 0xd0 >> 1),
.type = "ds1338",
}, },
}; };
......
...@@ -342,8 +342,7 @@ static struct platform_device versatile_i2c_device = { ...@@ -342,8 +342,7 @@ static struct platform_device versatile_i2c_device = {
static struct i2c_board_info versatile_i2c_board_info[] = { static struct i2c_board_info versatile_i2c_board_info[] = {
{ {
I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), I2C_BOARD_INFO("ds1338", 0xd0 >> 1),
.type = "ds1338",
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment