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 master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[sfrench/cifs-2.6.git]
/
include
/
linux
/
i2c-algo-bit.h
diff --git
a/include/linux/i2c-algo-bit.h
b/include/linux/i2c-algo-bit.h
index c0e7fab28ce345dc0c48c0a430fc640077caa181..937da70cb4c415b962e9de76f2940a4806cae112 100644
(file)
--- a/
include/linux/i2c-algo-bit.h
+++ b/
include/linux/i2c-algo-bit.h
@@
-26,9
+26,9
@@
/* --- Defines for bit-adapters --------------------------------------- */
/*
/* --- Defines for bit-adapters --------------------------------------- */
/*
- * This struct contains the hw-dependent functions of bit-style adapters to
+ * This struct contains the hw-dependent functions of bit-style adapters to
* manipulate the line states, and to init any hw-specific features. This is
* manipulate the line states, and to init any hw-specific features. This is
- * only used if you have more than one hw-type of adapter running.
+ * only used if you have more than one hw-type of adapter running.
*/
struct i2c_algo_bit_data {
void *data; /* private data for lowlevel routines */
*/
struct i2c_algo_bit_data {
void *data; /* private data for lowlevel routines */
@@
-40,11
+40,9
@@
struct i2c_algo_bit_data {
/* local settings */
int udelay; /* half-clock-cycle time in microsecs */
/* i.e. clock is (500 / udelay) KHz */
/* 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 */
};
int i2c_bit_add_bus(struct i2c_adapter *);
int timeout; /* in jiffies */
};
int i2c_bit_add_bus(struct i2c_adapter *);
-int i2c_bit_del_bus(struct i2c_adapter *);
#endif /* _LINUX_I2C_ALGO_BIT_H */
#endif /* _LINUX_I2C_ALGO_BIT_H */