diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:31:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:31:02 -0700 |
| commit | 8566cfc9fe0934f52ddedc12b083176116c13978 (patch) | |
| tree | b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /drivers/i2c/chips/m41t00.c | |
| parent | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff) | |
| parent | 77ae84554cc0178e03862391599a0cedf96fa4c4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/i2c/chips/m41t00.c')
| -rw-r--r-- | drivers/i2c/chips/m41t00.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c index 778d7e12859..3f14528a52a 100644 --- a/drivers/i2c/chips/m41t00.c +++ b/drivers/i2c/chips/m41t00.c @@ -42,7 +42,6 @@ static struct i2c_client_address_data addr_data = { .normal_i2c = normal_addr, .probe = ignore, .ignore = ignore, - .force = ignore, }; ulong @@ -145,7 +144,7 @@ m41t00_set_tlet(ulong arg) return; } -ulong new_time; +static ulong new_time; DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time); |