git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[sfrench/cifs-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-ixp4xx.c
diff --git
a/drivers/i2c/busses/i2c-ixp4xx.c
b/drivers/i2c/busses/i2c-ixp4xx.c
index 2ed07112d683fa7cd1c72b0a31a7e95c6645543d..ab573254a8aa305c1703f4005b9477e296819397 100644
(file)
--- a/
drivers/i2c/busses/i2c-ixp4xx.c
+++ b/
drivers/i2c/busses/i2c-ixp4xx.c
@@
-122,7
+122,6
@@
static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
drv_data->algo_data.getsda = ixp4xx_bit_getsda;
drv_data->algo_data.getscl = ixp4xx_bit_getscl;
drv_data->algo_data.udelay = 10;
- drv_data->algo_data.mdelay = 10;
drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP4XX;