diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-19 18:02:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:12 -0400 |
commit | 5071860aba7fc69279ab822638ed2c2e4549f9fd (patch) | |
tree | e23a3c7eba547c9d81c7680a40c41536c8a45da3 /include/linux/i2c.h | |
parent | 4926c0d4de77c5396a274ee7941ed7fc02afed26 (diff) |
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (7/9)
Kill normal_isa in header files, documentation and all chip drivers, as
it is no more used.
normal_i2c could be renamed to normal, but I decided not to do so at the
moment, so as to limit the number of changes. This might be done later
as part of the i2c_probe/i2c_detect merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r-- | include/linux/i2c.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 3be06105034c..39ff363eadec 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -150,12 +150,9 @@ struct i2c_driver { | |||
150 | */ | 150 | */ |
151 | struct i2c_client { | 151 | struct i2c_client { |
152 | unsigned int flags; /* div., see below */ | 152 | unsigned int flags; /* div., see below */ |
153 | unsigned int addr; /* chip address - NOTE: 7bit */ | 153 | unsigned short addr; /* chip address - NOTE: 7bit */ |
154 | /* addresses are stored in the */ | 154 | /* addresses are stored in the */ |
155 | /* _LOWER_ 7 bits of this char */ | 155 | /* _LOWER_ 7 bits */ |
156 | /* addr: unsigned int to make lm_sensors i2c-isa adapter work | ||
157 | more cleanly. It does not take any more memory space, due to | ||
158 | alignment considerations */ | ||
159 | struct i2c_adapter *adapter; /* the adapter we sit on */ | 156 | struct i2c_adapter *adapter; /* the adapter we sit on */ |
160 | struct i2c_driver *driver; /* and our access routines */ | 157 | struct i2c_driver *driver; /* and our access routines */ |
161 | int usage_count; /* How many accesses currently */ | 158 | int usage_count; /* How many accesses currently */ |
@@ -309,7 +306,6 @@ struct i2c_client_address_data { | |||
309 | 306 | ||
310 | /* Internal numbers to terminate lists */ | 307 | /* Internal numbers to terminate lists */ |
311 | #define I2C_CLIENT_END 0xfffeU | 308 | #define I2C_CLIENT_END 0xfffeU |
312 | #define I2C_CLIENT_ISA_END 0xfffefffeU | ||
313 | 309 | ||
314 | /* The numbers to use to set I2C bus address */ | 310 | /* The numbers to use to set I2C bus address */ |
315 | #define ANY_I2C_BUS 0xffff | 311 | #define ANY_I2C_BUS 0xffff |