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/acpi/i2c_ec.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/acpi/i2c_ec.c')
| -rw-r--r-- | drivers/acpi/i2c_ec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c index 6809c283ec58..6342e612c203 100644 --- a/drivers/acpi/i2c_ec.c +++ b/drivers/acpi/i2c_ec.c | |||
| @@ -293,7 +293,7 @@ static u32 acpi_ec_smb_func(struct i2c_adapter *adapter) | |||
| 293 | I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC); | 293 | I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | static struct i2c_algorithm acpi_ec_smbus_algorithm = { | 296 | static const struct i2c_algorithm acpi_ec_smbus_algorithm = { |
| 297 | .smbus_xfer = acpi_ec_smb_access, | 297 | .smbus_xfer = acpi_ec_smb_access, |
| 298 | .functionality = acpi_ec_smb_func, | 298 | .functionality = acpi_ec_smb_func, |
| 299 | }; | 299 | }; |