diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
| commit | 34b8c399dc04c8e51f014b73458e654570698597 (patch) | |
| tree | 7027eda7a780e9d945ef271f8c2ea5aaede5dd25 /drivers/usb/input/wacom.c | |
| parent | eaceec7f6cc5223d0f146086884d67746b8aa81d (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | kernel-crypto-34b8c399dc04c8e51f014b73458e654570698597.tar.gz kernel-crypto-34b8c399dc04c8e51f014b73458e654570698597.tar.xz kernel-crypto-34b8c399dc04c8e51f014b73458e654570698597.zip | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/input/wacom.c')
| -rw-r--r-- | drivers/usb/input/wacom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c index aea1cfae34c..dc099bbe12b 100644 --- a/drivers/usb/input/wacom.c +++ b/drivers/usb/input/wacom.c @@ -854,7 +854,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS); input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS); - input_set_abs_params(input_dev, ABS_X, 0, wacom->features->y_max, 4, 0); + input_set_abs_params(input_dev, ABS_X, 0, wacom->features->x_max, 4, 0); input_set_abs_params(input_dev, ABS_Y, 0, wacom->features->y_max, 4, 0); input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0); |