On Mon, 2 Nov 2015, Ping Cheng wrote: > On Mon, Nov 2, 2015 at 3:41 PM, Jason Gerecke <killertofu@xxxxxxxxx> wrote: > > When support for the Cintiq Companion Hybrid and Cintiq Companion 2 was > > added (36d3c51 and f7acb55), the 'wacom_query_tablet_data' function was > > updated to include references to CINTIQ_HYBRID and CINTIQ_COMPANION_2 > > with the thought that they were necessary to switch the touch interface > > into the proper mode. This is unnecessary, however, since those types > > are only ever associated with the pen interface -- the touch interfaces > > are either CINTIQ_24HDT or HID_GENERIC. To avoid confusion in the future, > > we remove the unnecessary CINTIQ_HYBRID and CINTIQ_COMPANION_2 conditions. > > > > Signed-off-by: Jason Gerecke <jason.gerecke@xxxxxxxxx> > > Reviewed-by: Ping Cheng <pingc@xxxxxxxxx> > > for this patch and the 3/3 of this set. This is really late in the game (the merge window is already open), but given the nature of the patches (we'll be sending them as -rc bugfixes later anyway), I've just picked those up to for-4.4/wacom. 1/1 I am sure you two will have some more discussion about :) so I am ignoring it for now. -- Jiri Kosina SUSE Labs -- 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
