Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

1 files changed, 17 insertions, 4 deletions

diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index dd2aeee6c66a..26c81f233606 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -68,9 +68,17 @@ isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
 {
         u8 reg_addr[1] = { reg };
         struct i2c_msg msgs[2] = {
-                {client->addr, 0, sizeof(reg_addr), reg_addr}
-                ,
-                {client->addr, I2C_M_RD, len, buf}
+                {
+                        .addr = client->addr,
+                        .len = sizeof(reg_addr),
+                        .buf = reg_addr
+                },
+                {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = len,
+                        .buf = buf
+                }
         };
         int ret;
 
@@ -90,7 +98,11 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
 {
         u8 i2c_buf[ISL1208_REG_USR2 + 2];
         struct i2c_msg msgs[1] = {
-                {client->addr, 0, len + 1, i2c_buf}
+                {
+                        .addr = client->addr,
+                        .len = len + 1,
+                        .buf = i2c_buf
+                }
         };
         int ret;
 
@@ -697,6 +709,7 @@ isl1208_remove(struct i2c_client *client)
 
 static const struct i2c_device_id isl1208_id[] = {
         { "isl1208", 0 },
+        { "isl1218", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, isl1208_id);