diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/acpi/i2c_ec.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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 | }; |