diff options
| author | David Brownell <david-b@pacbell.net> | 2007-05-01 17:26:32 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@hyperion.delvare> | 2007-05-01 17:26:32 -0400 |
| commit | 7c175499822ba34ba60f32e4995fcc16c007d308 (patch) | |
| tree | cbcc51acac77b2d9a73eded621cc442af5e5feb9 /drivers/i2c | |
| parent | d24ecfcc3953f9c3b833508cd839be614a3f3c64 (diff) | |
i2c-omap: Switch to static adapter numbering
Update the OMAP I2C driver to use i2c_add_numbered_adapter(), so that
later patches can convert boards to using new-style drivers.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index bcd8367cede1..e471e3bfdc1e 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -605,7 +605,8 @@ omap_i2c_probe(struct platform_device *pdev) | |||
| 605 | adap->dev.parent = &pdev->dev; | 605 | adap->dev.parent = &pdev->dev; |
| 606 | 606 | ||
| 607 | /* i2c device drivers may be active on return from add_adapter() */ | 607 | /* i2c device drivers may be active on return from add_adapter() */ |
| 608 | r = i2c_add_adapter(adap); | 608 | adap->nr = pdev->id; |
| 609 | r = i2c_add_numbered_adapter(adap); | ||
| 609 | if (r) { | 610 | if (r) { |
| 610 | dev_err(dev->dev, "failure adding adapter\n"); | 611 | dev_err(dev->dev, "failure adding adapter\n"); |
| 611 | goto err_free_irq; | 612 | goto err_free_irq; |