summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom_wac.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 10:03:29 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-06 10:03:29 +0100
commit70324494b6f283311c5339fb1795fdec2d8850d9 (patch)
tree5a318c2b60ba6e7861d630310d1930f62b8893ce /drivers/input/tablet/wacom_wac.c
parent73b5301b02c8d3456a5ea64c9ed9802a4a376af6 (diff)
parente47a682ace0cd56eb8e09b806c2b0f034b491520 (diff)
downloadblackbird-obmc-linux-70324494b6f283311c5339fb1795fdec2d8850d9.tar.gz
blackbird-obmc-linux-70324494b6f283311c5339fb1795fdec2d8850d9.zip
Merge branch 'spi-linus' into spi-next
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
-rw-r--r--drivers/input/tablet/wacom_wac.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index aa6010131179..0a67031ffc13 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1518,6 +1518,9 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);
+
+ __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
+
wacom_setup_cintiq(wacom_wac);
break;
OpenPOWER on IntegriCloud