diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-31 13:27:22 -0500 |
| commit | eea60caef610c7a6c58c0de9c80ae1e438e01301 (patch) | |
| tree | 25e19289bba003fe085e589430d0d981fd6b73a7 /drivers/usb/input/kbtab.c | |
| parent | da8543ef125afc7bba4da526b61a1ae07dc25109 (diff) | |
| parent | 82c9df820112c6286a8e8fbe482e94b65b49062c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/usb/input/kbtab.c')
| -rw-r--r-- | drivers/usb/input/kbtab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c index a248664b5d1d..fd48e74e78ed 100644 --- a/drivers/usb/input/kbtab.c +++ b/drivers/usb/input/kbtab.c | |||
| @@ -159,7 +159,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 159 | input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH); | 159 | input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH); |
| 160 | input_dev->mscbit[0] |= BIT(MSC_SERIAL); | 160 | input_dev->mscbit[0] |= BIT(MSC_SERIAL); |
| 161 | input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0); | 161 | input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0); |
| 162 | input_set_abs_params(input_dev, ABS_X, 0, 0x1750, 4, 0); | 162 | input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0); |
| 163 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0); | 163 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0); |
| 164 | 164 | ||
| 165 | endpoint = &intf->cur_altsetting->endpoint[0].desc; | 165 | endpoint = &intf->cur_altsetting->endpoint[0].desc; |