git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-ixp2000.c
diff --git
a/drivers/i2c/busses/i2c-ixp2000.c
b/drivers/i2c/busses/i2c-ixp2000.c
index
cd6f45d
..
dd3f4cd
100644
(file)
--- a/
drivers/i2c/busses/i2c-ixp2000.c
+++ b/
drivers/i2c/busses/i2c-ixp2000.c
@@
-114,7
+114,6
@@
static int ixp2000_i2c_probe(struct platform_device *plat_dev)
drv_data->algo_data.getsda = ixp2000_bit_getsda;
drv_data->algo_data.getscl = ixp2000_bit_getscl;
drv_data->algo_data.udelay = 6;
- drv_data->algo_data.mdelay = 6;
drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP2000,