summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/aiptek.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-03 17:00:06 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-01-03 17:00:06 +0100
commit61420e147a706ee7c7a902008045547fb2a2a330 (patch)
treec5739fe1feac05cac49c96107138520c65f8f657 /drivers/usb/input/aiptek.c
parent[libata sata_promise] irq_pio: fix merge bug (diff)
parentMerge branch 'master' (diff)
downloadlinux-61420e147a706ee7c7a902008045547fb2a2a330.tar.xz
linux-61420e147a706ee7c7a902008045547fb2a2a330.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/usb/input/aiptek.c')
-rw-r--r--drivers/usb/input/aiptek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 1c3b472a3bca..0e2505c073db 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -2103,7 +2103,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
* values.
*/
input_set_abs_params(inputdev, ABS_X, 0, 2999, 0, 0);
- input_set_abs_params(inputdev, ABS_X, 0, 2249, 0, 0);
+ input_set_abs_params(inputdev, ABS_Y, 0, 2249, 0, 0);
input_set_abs_params(inputdev, ABS_PRESSURE, 0, 511, 0, 0);
input_set_abs_params(inputdev, ABS_TILT_X, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);