diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:41:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:41:28 -0400 |
| commit | 142e27fc8a3619471669d6241784eec9167c47d1 (patch) | |
| tree | e88850b63ec910ee28874f93c43fb66421bb8119 /drivers/video/aty/radeon_i2c.c | |
| parent | a9053d0494d3c92807701c0f47df61d50c971581 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/aty/radeon_i2c.c')
| -rw-r--r-- | drivers/video/aty/radeon_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c index 762244164c81..a9d0414e4655 100644 --- a/drivers/video/aty/radeon_i2c.c +++ b/drivers/video/aty/radeon_i2c.c | |||
| @@ -75,7 +75,7 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name) | |||
| 75 | 75 | ||
| 76 | strcpy(chan->adapter.name, name); | 76 | strcpy(chan->adapter.name, name); |
| 77 | chan->adapter.owner = THIS_MODULE; | 77 | chan->adapter.owner = THIS_MODULE; |
| 78 | chan->adapter.id = I2C_ALGO_ATI; | 78 | chan->adapter.id = I2C_HW_B_RADEON; |
| 79 | chan->adapter.algo_data = &chan->algo; | 79 | chan->adapter.algo_data = &chan->algo; |
| 80 | chan->adapter.dev.parent = &chan->rinfo->pdev->dev; | 80 | chan->adapter.dev.parent = &chan->rinfo->pdev->dev; |
| 81 | chan->algo.setsda = radeon_gpio_setsda; | 81 | chan->algo.setsda = radeon_gpio_setsda; |