Title: [6457] trunk/drivers/input/touchscreen/ad7877.c: merge the version that was applied to mainline
- Revision
- 6457
- Author
- vapier
- Date
- 2009-05-24 00:08:33 -0500 (Sun, 24 May 2009)
Log Message
merge the version that was applied to mainline
Modified Paths
Diff
Modified: trunk/drivers/input/touchscreen/ad7877.c (6456 => 6457)
--- trunk/drivers/input/touchscreen/ad7877.c 2009-05-24 05:08:00 UTC (rev 6456)
+++ trunk/drivers/input/touchscreen/ad7877.c 2009-05-24 05:08:33 UTC (rev 6457)
@@ -1,12 +1,9 @@
/*
- * File: drivers/input/touchscreen/ad7877.c
+ * Copyright (C) 2006-2008 Michael Hennerich, Analog Devices Inc.
*
+ * Description: AD7877 based touchscreen, sensor (ADCs), DAC and GPIO driver
* Based on: ads7846.c
*
- * Copyright (C) 2006-2008 Michael Hennerich, Analog Devices Inc.
- *
- * Description: AD7877 based touchscreen, sensor (ADCs), DAC and GPIO driver
- *
* Bugs: Enter bugs at http://blackfin.uclinux.org/
*
* This program is free software; you can redistribute it and/or modify
@@ -699,7 +696,7 @@
ts->averaging = pdata->averaging;
ts->pen_down_acc_interval = pdata->pen_down_acc_interval;
- snprintf(ts->phys, sizeof(ts->phys), "%s/inputX", dev_name(&spi->dev));
+ snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev));
input_dev->name = "AD7877 Touchscreen";
input_dev->phys = ts->phys;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
