Pull sim-fixes into release branch

[powerpc.git] / drivers / i2c / chips / ds1374.c

diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index 8d20b81..0936327 100644 (file)
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -27,8 +27,6 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 
-#include <asm/rtc.h>
-
 #define DS1374_REG_TOD0                0x00
 #define DS1374_REG_TOD1                0x01
 #define DS1374_REG_TOD2                0x02
@@ -55,7 +53,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c = normal_addr,
        .probe = ignore,
        .ignore = ignore,
-       .force = ignore,
 };
 
 static ulong ds1374_read_rtc(void)
@@ -168,7 +165,7 @@ static void ds1374_set_tlet(ulong arg)
                         "can't confirm time set from rtc chip\n");
 }
 
-ulong new_time;
+static ulong new_time;
 
 DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);