diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 15:17:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 15:17:26 +0900 |
| commit | e161183ba674f97fce748384f5bb037d07bdc5c9 (patch) | |
| tree | 5b3bd4b995f6435ee977b71082244fa1a647f717 /drivers/input/touchscreen/atmel_tsadcc.c | |
| parent | 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/touchscreen/atmel_tsadcc.c')
| -rw-r--r-- | drivers/input/touchscreen/atmel_tsadcc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c index a89a6a8f05e6..055969e8be13 100644 --- a/drivers/input/touchscreen/atmel_tsadcc.c +++ b/drivers/input/touchscreen/atmel_tsadcc.c @@ -236,7 +236,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev) ts_dev->bufferedmeasure = 0; snprintf(ts_dev->phys, sizeof(ts_dev->phys), - "%s/input0", pdev->dev.bus_id); + "%s/input0", dev_name(&pdev->dev)); input_dev->name = "atmel touch screen controller"; input_dev->phys = ts_dev->phys; |