Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / tsc2005.c

diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 03c3a102dd61f7e6c844b1d5cd54bc20c3896975..ec4c9e7a736753a7070af69cbddcbd551d0a0f1d 100644 (file)
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -566,7 +566,7 @@ static int __devinit tsc2005_ts_init(struct tsc2005 *ts,
 
        idev->name = "TSC2005 touchscreen";
        snprintf(ts->phys, sizeof(ts->phys), "%s/input-ts",
-                ts->spi->dev.bus_id);
+                dev_name(&ts->spi->dev));
        idev->phys = ts->phys;
 
        idev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);