commit f1a6391594ce25d2ff8a0479e9dc461354b585f3
author Ed James <edjames@google.com> Thu Mar 05 20:02:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 05 20:02:50 2015 +0000
tree 24b0587050ef2cc3876806075bb6a1118bbf7b8e
parent 816f6884cbd46a442ea77184c8eb6bb690745a70
parent c9bce10df3e0a3d3d48799d9bb02ccda0a3995a3

Merge "gfrm200: fix live button" into newkernel_dev

drivers/hid/hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index dd5f347..2263462 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -756,7 +756,7 @@
 		case 0x08b: map_key_clear(KEY_DVD);		break;
 		case 0x08c: map_key_clear(KEY_PHONE);		break;
 		case 0x08d: map_key_clear(KEY_PROGRAM);		break;
-		case 0x08e: map_key_clear(KEY_VIDEOPHONE);	break; /* GFRM200 live */
+		case 0x08e: map_key_clear(KEY_TV);		break; /* GFRM200 live */
 		case 0x08f: map_key_clear(KEY_GAMES);		break;
 		case 0x090: map_key_clear(KEY_MEMO);		break;
 		case 0x091: map_key_clear(KEY_CD);		break;