Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / lm8323.c

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index a796680b785ac87e786d719d0f6d803f53081f29..a95ea0333007ec2d2a14fed7ee600e8ac83e408b 100644 (file)
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -777,7 +777,7 @@ static int lm8323_probe(struct i2c_client *client,
                idev->name = pdata->name;
        else
                idev->name = "LM8323 keypad";
-       snprintf(lm->phys, sizeof(lm->phys), "%s/input-kp", client->dev.bus_id);
+       snprintf(lm->phys, sizeof(lm->phys), "%s/input-kp", dev_name(&client->dev));
        idev->phys = lm->phys;
 
        lm->keys_down = 0;