diff options
author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /drivers/input | |
parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/mouse/synaptics.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h index b6aa7d20d8a3..298c8e505cc2 100644 --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h @@ -51,7 +51,8 @@ #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) #define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) -#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) +#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100000) /* 1-button ClickPad */ +#define SYN_CAP_CLICKPAD2BTN(ex0c) ((ex0c) & 0x000100) /* 2-button ClickPad */ #define SYN_CAP_MAX_DIMENSIONS(ex0c) ((ex0c) & 0x020000) /* synaptics modes query bits */ |