---

yaml --- r: 602887 b: refs/heads/develop-4.4 c: 36e6781 h: refs/heads/release-4.4 i: 602885: 454a12b 602883: 7d456df 602879: e37aff9
Kwiboo · Apr 3, 2014 · bd839d7 · bd839d7
1 parent e439115
commit bd839d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -4,7 +4,7 @@ refs/heads/wip-zhengxing-4.1: bfdca85aae9ecc60b3120367fdbd5ae0cd2da876
 "refs/heads/android_4.1_vop": 1f99b96acb7015483220feef4cedab781bb233ff
 "refs/heads/android_4.1": 5a5e85138a496ad25158f097a7b6ca9412a25d44
 refs/heads/upstream-4.4: 8defe0a126dfa39ec4cc5b4c9b31d660fc586265
-refs/heads/develop-4.4: cbcc4cb6cc8fe13959a52db4427c1ccc01655d4e
+refs/heads/develop-4.4: 36e6781e914b1232ba0bd0ca8ae718941cb2fa8f
 refs/heads/develop4.4-ipa: 3228442d147ac202210ff1a0f903c2b612087d0f
 refs/heads/develop4.4: 988a41d223731398982f83024841fad85537d524
 refs/heads/evk-v4.1: 07fd66f7dc0da041d88237a9a77f3f15e45f469b

diff --git a/branches/develop-4.4/drivers/input/mouse/cypress_ps2.c b/branches/develop-4.4/drivers/input/mouse/cypress_ps2.c
@@ -410,7 +410,6 @@ static int cypress_set_input_params(struct input_dev *input,
 	__clear_bit(REL_X, input->relbit);
 	__clear_bit(REL_Y, input->relbit);
 
-	__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
 	__set_bit(EV_KEY, input->evbit);
 	__set_bit(BTN_LEFT, input->keybit);
 	__set_bit(BTN_RIGHT, input->keybit);