From 1382b73341805f2675cb3cfd1af7bd89ef9fe622 Mon Sep 17 00:00:00 2001
From: Kevin Wells <kevin.wells@nxp.com>
Date: Thu, 12 Nov 2009 00:34:17 +0100
Subject: [PATCH] --- yaml --- r: 173869 b: refs/heads/master c:
 155a49319fabae97c14c7eb474562f2bdfe5af1f h: refs/heads/master i:   173867:
 6ff3f35b0662ed83ac21b61f131de77175b95957 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/i2c/busses/i2c-pnx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f90280b0768..8c9d84bbb4f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef871432e1334dea4c79f9875f4db87cee7b9b50
+refs/heads/master: 155a49319fabae97c14c7eb474562f2bdfe5af1f
diff --git a/trunk/drivers/i2c/busses/i2c-pnx.c b/trunk/drivers/i2c/busses/i2c-pnx.c
index fbab6846ae64..5d1c2603a130 100644
--- a/trunk/drivers/i2c/busses/i2c-pnx.c
+++ b/trunk/drivers/i2c/busses/i2c-pnx.c
@@ -638,7 +638,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
 
 	/* Register this adapter with the I2C subsystem */
 	i2c_pnx->adapter->dev.parent = &pdev->dev;
-	ret = i2c_add_adapter(i2c_pnx->adapter);
+	i2c_pnx->adapter->nr = pdev->id;
+	ret = i2c_add_numbered_adapter(i2c_pnx->adapter);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "I2C: Failed to add bus\n");
 		goto out_irq;