[i2c] [patch 2.6.21-rc + i2c/quilt] i2c-omap adapter numbering

[David Brownell]

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 at users.sourceforge.net>

--- osk2.orig/drivers/i2c/busses/i2c-omap.c	2007-03-17 21:00:39.000000000 -0700
+++ osk2/drivers/i2c/busses/i2c-omap.c	2007-03-22 22:34:39.000000000 -0700
@@ -648,7 +648,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;