diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/i2c/busses/i2c-sis96x.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/i2c/busses/i2c-sis96x.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sis96x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index 1a73c0532fc7..7fd07fbac336 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c | |||
| @@ -242,7 +242,7 @@ static u32 sis96x_func(struct i2c_adapter *adapter) | |||
| 242 | I2C_FUNC_SMBUS_PROC_CALL; | 242 | I2C_FUNC_SMBUS_PROC_CALL; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | static struct i2c_algorithm smbus_algorithm = { | 245 | static const struct i2c_algorithm smbus_algorithm = { |
| 246 | .smbus_xfer = sis96x_access, | 246 | .smbus_xfer = sis96x_access, |
| 247 | .functionality = sis96x_func, | 247 | .functionality = sis96x_func, |
| 248 | }; | 248 | }; |