diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/input/tablet/wacom.h | |
| parent | Input: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff) | |
| parent | Input: adp5589-keys - add support for the ADP5585 derivatives (diff) | |
| download | linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.xz linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/tablet/wacom.h')
| -rw-r--r-- | drivers/input/tablet/wacom.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index 23317bd09c82..0783864a7dc2 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h @@ -11,7 +11,7 @@ * Copyright (c) 2000 Daniel Egger <egger@suse.de> * Copyright (c) 2001 Frederic Lepied <flepied@mandrakesoft.com> * Copyright (c) 2004 Panagiotis Issaris <panagiotis.issaris@mech.kuleuven.ac.be> - * Copyright (c) 2002-2009 Ping Cheng <pingc@wacom.com> + * Copyright (c) 2002-2011 Ping Cheng <pingc@wacom.com> * * ChangeLog: * v0.1 (vp) - Initial release @@ -93,7 +93,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.52" +#define DRIVER_VERSION "v1.53" #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" #define DRIVER_DESC "USB Wacom tablet driver" #define DRIVER_LICENSE "GPL" @@ -114,6 +114,12 @@ struct wacom { struct mutex lock; bool open; char phys[32]; + struct wacom_led { + u8 select[2]; /* status led selector (0..3) */ + u8 llv; /* status led brightness no button (1..127) */ + u8 hlv; /* status led brightness button pressed (1..127) */ + u8 img_lum; /* OLED matrix display brightness */ + } led; }; extern const struct usb_device_id wacom_ids[]; |