diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-18 16:51:55 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-18 18:08:59 +0200 |
| commit | 64e8be6ebdb8212898781fff7722ff2b0eb76131 (patch) | |
| tree | 445ab6210567e94ce2ea928bccb2fe088649b87e | |
| parent | [ARM] 5608/1: Updated U300 defconfig (diff) | |
| download | linux-64e8be6ebdb8212898781fff7722ff2b0eb76131.tar.xz linux-64e8be6ebdb8212898781fff7722ff2b0eb76131.zip | |
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: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-realview/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 9ea9c05093cd..facbd49eec67 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c @@ -208,8 +208,7 @@ struct platform_device realview_i2c_device = { static struct i2c_board_info realview_i2c_board_info[] = { { - I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), - .type = "ds1338", + I2C_BOARD_INFO("ds1338", 0xd0 >> 1), }, }; diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 69214fc8bd19..31093af7d052 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -342,8 +342,7 @@ static struct platform_device versatile_i2c_device = { static struct i2c_board_info versatile_i2c_board_info[] = { { - I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), - .type = "ds1338", + I2C_BOARD_INFO("ds1338", 0xd0 >> 1), }, }; |