diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:46:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:46:19 -0700 |
| commit | fb00f7629bb94ef9189fc3790b95306a144f58c5 (patch) | |
| tree | 6e73455e0538e3ff6e3303460ab1c7bb9bab1c3e /drivers/input/tablet/wacom.h | |
| parent | 992ab12ac390a8b98b45d03f617481e6265811c0 (diff) | |
| parent | 3c00bb96497a9c1251359a1faf68dddbb8d50a23 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290
Input: ALPS - put secondary device in proper place in sysfs
Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX
Input: document i8042.noloop
Input: add keyboard notifier documentation
Input: ads7846 - fix uninitialized var warning
Input: i8042 - add SNI RM support
Input: i8042 - add Lenovo 3000 N100 to nomux blacklist
Input: i8042 - fix warning on non-x86 builds
Input: cobalt_btns - assorted fixes
Diffstat (limited to 'drivers/input/tablet/wacom.h')
| -rw-r--r-- | drivers/input/tablet/wacom.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index 6542edb6f76..acf9830698c 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-2007 Ping Cheng <pingc@wacom.com> + * Copyright (c) 2002-2008 Ping Cheng <pingc@wacom.com> * * ChangeLog: * v0.1 (vp) - Initial release @@ -65,6 +65,7 @@ * - and wacom_wac.c deals with Wacom specific code * - Support Intuos3 4x6 * v1.47 (pc) - Added support for Bamboo + * v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX */ /* @@ -85,7 +86,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.47" +#define DRIVER_VERSION "v1.48" #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" #define DRIVER_LICENSE "GPL" @@ -125,6 +126,7 @@ extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac); +extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern __u16 wacom_le16_to_cpu(unsigned char *data); extern __u16 wacom_be16_to_cpu(unsigned char *data); extern struct wacom_features * get_wacom_feature(const struct usb_device_id *id); |