Merge /spare/repo/linux-2.6/

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index a18bdd9aa7ba..a1d580e05361 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -395,8 +395,6 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
 
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm scx200_acb_algorithm = {
-        .name           = "NatSemi SCx200 ACCESS.bus",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = scx200_acb_smbus_xfer,
         .functionality  = scx200_acb_func,
 };
@@ -456,7 +454,7 @@ static int  __init scx200_acb_create(int base, int index)
         i2c_set_adapdata(adapter, iface);
         snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
         adapter->owner = THIS_MODULE;
-        adapter->id = I2C_ALGO_SMBUS;
+        adapter->id = I2C_HW_SMBUS_SCX200;
         adapter->algo = &scx200_acb_algorithm;
         adapter->class = I2C_CLASS_HWMON;