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 branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-i810.c
diff --git
a/drivers/i2c/busses/i2c-i810.c
b/drivers/i2c/busses/i2c-i810.c
index
0ff7016
..
b66fb6b
100644
(file)
--- a/
drivers/i2c/busses/i2c-i810.c
+++ b/
drivers/i2c/busses/i2c-i810.c
@@
-32,6
+32,7
@@
i810AB 7123
i810E 7125
i815 1132
i810AB 7123
i810E 7125
i815 1132
+ i845G 2562
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-165,7
+166,6
@@
static struct i2c_algo_bit_data i810_i2c_bit_data = {
.getsda = bit_i810i2c_getsda,
.getscl = bit_i810i2c_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_i810i2c_getsda,
.getscl = bit_i810i2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
.timeout = TIMEOUT,
};
@@
-181,7
+181,6
@@
static struct i2c_algo_bit_data i810_ddc_bit_data = {
.getsda = bit_i810ddc_getsda,
.getscl = bit_i810ddc_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_i810ddc_getsda,
.getscl = bit_i810ddc_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
.timeout = TIMEOUT,
};