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/riva/rivafb-i2c.c | |
| parent | a9053d0494d3c92807701c0f47df61d50c971581 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/riva/rivafb-i2c.c')
| -rw-r--r-- | drivers/video/riva/rivafb-i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c index da1334dfd51d..77151d8e0766 100644 --- a/drivers/video/riva/rivafb-i2c.c +++ b/drivers/video/riva/rivafb-i2c.c @@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data) return val; } -#define I2C_ALGO_RIVA 0x0e0000 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name) { int rc; strcpy(chan->adapter.name, name); chan->adapter.owner = THIS_MODULE; - chan->adapter.id = I2C_ALGO_RIVA; + chan->adapter.id = I2C_HW_B_RIVA; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pdev->dev; chan->algo.setsda = riva_gpio_setsda; |