From 1750206023c8be21bac39b08be76c8ec41dc9a10 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Thu, 12 Jul 2007 14:12:29 +0200 Subject: [PATCH] --- yaml --- r: 58814 b: refs/heads/master c: 1469fa263870acd890a4b9f6ef557acc5d673b44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-mpc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20b05eeb4bd8..3f702d63b66e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65b22ad9508b609b0625eccb2680996a1e09ed16 +refs/heads/master: 1469fa263870acd890a4b9f6ef557acc5d673b44 diff --git a/trunk/drivers/i2c/busses/i2c-mpc.c b/trunk/drivers/i2c/busses/i2c-mpc.c index c6b6898592b1..a769efc7f408 100644 --- a/trunk/drivers/i2c/busses/i2c-mpc.c +++ b/trunk/drivers/i2c/busses/i2c-mpc.c @@ -327,9 +327,10 @@ static int fsl_i2c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c); i2c->adap = mpc_ops; + i2c->adap.nr = pdev->id; i2c_set_adapdata(&i2c->adap, i2c); i2c->adap.dev.parent = &pdev->dev; - if ((result = i2c_add_adapter(&i2c->adap)) < 0) { + if ((result = i2c_add_numbered_adapter(&i2c->adap)) < 0) { printk(KERN_ERR "i2c-mpc - failed to add adapter\n"); goto fail_add; }