diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/i2c/busses/i2c-sis630.c | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-sis630.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sis630.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index f58455e7689e..86f0f448fa0b 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
@@ -448,8 +448,6 @@ exit: | |||
448 | 448 | ||
449 | 449 | ||
450 | static struct i2c_algorithm smbus_algorithm = { | 450 | static struct i2c_algorithm smbus_algorithm = { |
451 | .name = "Non-I2C SMBus adapter", | ||
452 | .id = I2C_ALGO_SMBUS, | ||
453 | .smbus_xfer = sis630_access, | 451 | .smbus_xfer = sis630_access, |
454 | .functionality = sis630_func, | 452 | .functionality = sis630_func, |
455 | }; | 453 | }; |