On Mon, Aug 26, 2013 at 10:13:30AM -0700, Jason Gerecke wrote: > Adds support for the sensors integrated in to the Cintiq Companion > Hybrid. These sensors use by-and-large the same protocol as the > Cintiq 24HD touch. > > NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to > both the EMR controller and CPU GPIO pins. It may be necessary to > disable their functionality in this driver if building a custom > Android kernel for this device (lest two events be sent to userspace > for every button press). > > Signed-off-by: Jason Gerecke <killertofu@xxxxxxxxx> > --- > Changes in v2: > * Remove "#if 1" block surrounding conditional ExpressKey reporting > * Change to C-style comments [...] > diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h > index dfc9e08..f47a5c1 100644 > --- a/drivers/input/tablet/wacom_wac.h > +++ b/drivers/input/tablet/wacom_wac.h > @@ -80,6 +80,7 @@ enum { > WACOM_22HD, > DTK, > WACOM_24HD, > + ASTERIX, > CINTIQ, > WACOM_BEE, > WACOM_13HD, > -- > 1.8.3.4 I assume ASTERIX is some internal codename - can we use the commonly used name instead? Cheers, Peter -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html