diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/i2c/busses/i2c-ali15x3.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/i2c/busses/i2c-ali15x3.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 7a5c0941dbc1..3f11b6e1a341 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
| @@ -463,7 +463,7 @@ static u32 ali15x3_func(struct i2c_adapter *adapter) | |||
| 463 | I2C_FUNC_SMBUS_BLOCK_DATA; | 463 | I2C_FUNC_SMBUS_BLOCK_DATA; |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | static struct i2c_algorithm smbus_algorithm = { | 466 | static const struct i2c_algorithm smbus_algorithm = { |
| 467 | .smbus_xfer = ali15x3_access, | 467 | .smbus_xfer = ali15x3_access, |
| 468 | .functionality = ali15x3_func, | 468 | .functionality = ali15x3_func, |
| 469 | }; | 469 | }; |