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/gregkh/i2c-2.6
[pandora-kernel.git]
/
include
/
linux
/
i2c-algo-bit.h
diff --git
a/include/linux/i2c-algo-bit.h
b/include/linux/i2c-algo-bit.h
index
c0e7fab
..
c8f8df2
100644
(file)
--- a/
include/linux/i2c-algo-bit.h
+++ b/
include/linux/i2c-algo-bit.h
@@
-40,7
+40,6
@@
struct i2c_algo_bit_data {
/* local settings */
int udelay; /* half-clock-cycle time in microsecs */
/* i.e. clock is (500 / udelay) KHz */
- int mdelay; /* in millisecs, unused */
int timeout; /* in jiffies */
};