Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/input/touchscreen/tsc2301_ts.c b/drivers/input/touchscreen/tsc2301_ts.c
index 6462cc2bf398447e67f60d821401fc85dd025ef8..a157b48dd0b8638a9187ed950be8403a12242d84 100644 (file)
--- a/drivers/input/touchscreen/tsc2301_ts.c
+++ b/drivers/input/touchscreen/tsc2301_ts.c
@@ -603,7 +603,7 @@ int __devinit tsc2301_ts_init(struct tsc2301 *tsc,
        }
        idev->name = "TSC2301 touchscreen";
        snprintf(ts->phys, sizeof(ts->phys),
-                "%s/input-ts", tsc->spi->dev.bus_id);
+                "%s/input-ts", dev_name(&tsc->spi->dev));
        idev->phys = ts->phys;
        idev->dev.parent = &tsc->spi->dev;