diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 15:36:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:19 -0400 |
commit | b78ec31582c60578ee1d3bb470791d6dde96ccf7 (patch) | |
tree | fa36aebdd3235c5cce1f70bac34066c4eeb5108b /drivers | |
parent | ef8dec5d8b3e96e359f377f35cd8caff42fe6d58 (diff) |
[PATCH] hwmon: hwmon vs i2c, second round (03/11)
We now have two identical structures, i2c_address_data in i2c-sensor.h
and i2c_client_address_data in i2c.h. We can kill one of them, I choose
to keep the one in i2c.h as it makes more sense (this structure is not
specific to sensors.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/i2c-sensor-detect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c index c952926c1482..70fcf7281988 100644 --- a/drivers/i2c/i2c-sensor-detect.c +++ b/drivers/i2c/i2c-sensor-detect.c | |||
@@ -28,7 +28,7 @@ static unsigned short empty[] = {I2C_CLIENT_END}; | |||
28 | 28 | ||
29 | /* Won't work for 10-bit addresses! */ | 29 | /* Won't work for 10-bit addresses! */ |
30 | int i2c_detect(struct i2c_adapter *adapter, | 30 | int i2c_detect(struct i2c_adapter *adapter, |
31 | struct i2c_address_data *address_data, | 31 | struct i2c_client_address_data *address_data, |
32 | int (*found_proc) (struct i2c_adapter *, int, int)) | 32 | int (*found_proc) (struct i2c_adapter *, int, int)) |
33 | { | 33 | { |
34 | int addr, i, found, j, err; | 34 | int addr, i, found, j, err; |