Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / arch / arm / mach-orion5x / rd88f5182-setup.c

diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index aebe6b8e5059d42f28b8cbb2a92fa60120aeb8a6..81abc1003aaef01d01081fd7f9bc7c392bba6db5 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -227,9 +227,7 @@ static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
  * RTC DS1338 on I2C bus
  ****************************************************************************/
 static struct i2c_board_info __initdata rd88f5182_i2c_rtc = {
-       .driver_name    = "rtc-ds1307",
-       .type           = "ds1338",
-       .addr           = 0x68,
+       I2C_BOARD_INFO("ds1338", 0x68),
 };
 
 /*****************************************************************************