| Message ID | 20140724203108.GA9191@core.coreip.homeip.net (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
Hi, On 07/24/2014 10:31 PM, Dmitry Torokhov wrote: > wacom_wac.h will be moving to drivers/hid. Since we only need 3 definitions > from it let's simply copy them over. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Ack, but you will want to drop the #include of wacom_wac.h yoo. Regards, Hans > --- > drivers/input/tablet/wacom_serial4.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c > index d3d251e..deef50e 100644 > --- a/drivers/input/tablet/wacom_serial4.c > +++ b/drivers/input/tablet/wacom_serial4.c > @@ -149,6 +149,11 @@ MODULE_LICENSE("GPL"); > #define F_HAS_STYLUS2 0x02 > #define F_HAS_SCROLLWHEEL 0x04 > > +/* device IDs */ > +#define STYLUS_DEVICE_ID 0x02 > +#define CURSOR_DEVICE_ID 0x06 > +#define ERASER_DEVICE_ID 0x0A > + > enum { STYLUS = 1, ERASER, CURSOR }; > > static const struct { > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jul 25, 2014 at 09:06:28PM +0200, Hans de Goede wrote: > Hi, > > On 07/24/2014 10:31 PM, Dmitry Torokhov wrote: > > wacom_wac.h will be moving to drivers/hid. Since we only need 3 definitions > > from it let's simply copy them over. > > > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > Ack, but you will want to drop the #include of wacom_wac.h yoo. Right, that was in my v2 ;) Thanks.
diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c index d3d251e..deef50e 100644 --- a/drivers/input/tablet/wacom_serial4.c +++ b/drivers/input/tablet/wacom_serial4.c @@ -149,6 +149,11 @@ MODULE_LICENSE("GPL"); #define F_HAS_STYLUS2 0x02 #define F_HAS_SCROLLWHEEL 0x04 +/* device IDs */ +#define STYLUS_DEVICE_ID 0x02 +#define CURSOR_DEVICE_ID 0x06 +#define ERASER_DEVICE_ID 0x0A + enum { STYLUS = 1, ERASER, CURSOR }; static const struct {
wacom_wac.h will be moving to drivers/hid. Since we only need 3 definitions from it let's simply copy them over. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/tablet/wacom_serial4.c | 5 +++++ 1 file changed, 5 insertions(+)