On Wed, Dec 8, 2010 at 10:44 PM, Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> wrote: > On Wed, Dec 08, 2010 at 05:23:49PM -0800, Ping Cheng wrote: >> Signed-off-by: Ping Cheng <pingc@xxxxxxxxx> >> --- >> drivers/input/touchscreen/wacom_w8001.c | 74 +++++++++++++++++++++++++++++-- >> 1 files changed, 70 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c >> index 90b92e8..68087d8 100644 >> --- a/drivers/input/touchscreen/wacom_w8001.c >> +++ b/drivers/input/touchscreen/wacom_w8001.c >> @@ -3,6 +3,7 @@ >> * >> * Copyright (c) 2008 Jaya Kumar >> * Copyright (c) 2010 Red Hat, Inc. >> + * Copyright (c) 2010 Ping Cheng, Wacom. <pingc@xxxxxxxxx> >> * >> * This file is subject to the terms and conditions of the GNU General Public >> * License. See the file COPYING in the main directory of this archive for >> @@ -86,6 +87,12 @@ struct w8001 { >> char phys[32]; >> int type; >> unsigned int pktlen; >> + bool pen_in_prox; >> + bool has_touch; >> + int max_touch_x; >> + int max_touch_y; >> + int max_pen_x; >> + int max_pen_y; > > This does not apply to my tree. What tree was it made against? It was based on Henrik's mt-next branch since there are MT support in the driver. Should I use yours for v2? Thank you. Ping -- 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