From cdde68e3a7d4cbf4701005ab6032366e76009419 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 19 Oct 2009 14:43:19 -0500 Subject: 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 Signed-off-by: Alan Tull Signed-off-by: Xinyu Chen --- drivers/i2c/busses/i2c-s6000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/i2c/busses/i2c-s6000.c') 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; -- cgit v1.2.3