From: David Brownell <david-b@pacbell.net>
Subject: 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>
---
 drivers/i2c/busses/i2c-omap.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.21-rc5.orig/drivers/i2c/busses/i2c-omap.c	2007-03-01 09:03:34.000000000 +0100
+++ linux-2.6.21-rc5/drivers/i2c/busses/i2c-omap.c	2007-03-28 13:40:29.000000000 +0200
@@ -605,7 +605,8 @@ omap_i2c_probe(struct platform_device *p
 	adap->dev.parent = &pdev->dev;
 
 	/* i2c device drivers may be active on return from add_adapter() */
-	r = i2c_add_adapter(adap);
+	adap->nr = pdev->id;
+	r = i2c_add_numbered_adapter(adap);
 	if (r) {
 		dev_err(dev->dev, "failure adding adapter\n");
 		goto err_free_irq;