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/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-parport.c
diff --git
a/drivers/i2c/busses/i2c-parport.c
b/drivers/i2c/busses/i2c-parport.c
index
934bd55
..
48a8294
100644
(file)
--- a/
drivers/i2c/busses/i2c-parport.c
+++ b/
drivers/i2c/busses/i2c-parport.c
@@
-138,7
+138,6
@@
static struct i2c_algo_bit_data parport_algo_data = {
.getsda = parport_getsda,
.getscl = parport_getscl,
.udelay = 60,
- .mdelay = 60,
.timeout = HZ,
};