Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/input/keyboard/tsc2301_kp.c b/drivers/input/keyboard/tsc2301_kp.c
index a974a5fdc2e67a17f7efde09bb7e7b0b2c2779c3..0f2cb7f5a10e69c9a4a2caad0cf75c768031f766 100644 (file)
--- a/drivers/input/keyboard/tsc2301_kp.c
+++ b/drivers/input/keyboard/tsc2301_kp.c
@@ -389,7 +389,7 @@ int __devinit tsc2301_kp_init(struct tsc2301 *tsc,
                idev->name = pdata->keyb_name;
        else
                idev->name = "TSC2301 keypad";
-       snprintf(kp->phys, sizeof(kp->phys), "%s/input-kp", tsc->spi->dev.bus_id);
+       snprintf(kp->phys, sizeof(kp->phys), "%s/input-kp", dev_name(&tsc->spi->dev));
        idev->phys = kp->phys;
 
        mask = 0;