diff options
| author | Rob Herring <r.herring@freescale.com> | 2009-10-19 14:43:19 -0500 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-02-12 17:19:16 +0100 |
| commit | cdde68e3a7d4cbf4701005ab6032366e76009419 (patch) | |
| tree | 5690552665f0b7843e6552e4d5fe7b63cbc78f51 /drivers/i2c/busses/i2c-s6000.c | |
| parent | 57d1417ea543b83760b3fd76a46b9d29deb2e444 (diff) | |
ENGR00117389 Port 5.0.0 release to 2.6.31
This is i.MX BSP 5.0.0 release ported to 2.6.31
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alan Tull <r80115@freescale.com>
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-s6000.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s6000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c index c91359f4965c..a19af5101d1b 100644 --- a/drivers/i2c/busses/i2c-s6000.c +++ b/drivers/i2c/busses/i2c-s6000.c @@ -276,7 +276,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev) } iface->res = request_mem_region(iface->res->start, resource_size(iface->res), - dev->dev.bus_id); + dev_name(&dev->dev)); if (!iface->res) { rc = -EBUSY; goto err_out; |