Merge branch 'egalax' into for-linus

[pandora-kernel.git] / drivers / hid / hid-lg.c

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 3677c90..f6433d8 100644 (file)
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -126,6 +126,9 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage,
        case 0x1004: lg_map_key_clear(KEY_VIDEO);               break;
        case 0x1005: lg_map_key_clear(KEY_AUDIO);               break;
        case 0x100a: lg_map_key_clear(KEY_DOCUMENTS);           break;
+       /* The following two entries are Playlist 1 and 2 on the MX3200 */
+       case 0x100f: lg_map_key_clear(KEY_FN_1);                break;
+       case 0x1010: lg_map_key_clear(KEY_FN_2);                break;
        case 0x1011: lg_map_key_clear(KEY_PREVIOUSSONG);        break;
        case 0x1012: lg_map_key_clear(KEY_NEXTSONG);            break;
        case 0x1013: lg_map_key_clear(KEY_CAMERA);              break;
@@ -137,6 +140,7 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage,
        case 0x1019: lg_map_key_clear(KEY_PROG1);               break;
        case 0x101a: lg_map_key_clear(KEY_PROG2);               break;
        case 0x101b: lg_map_key_clear(KEY_PROG3);               break;
+       case 0x101c: lg_map_key_clear(KEY_CYCLEWINDOWS);        break;
        case 0x101f: lg_map_key_clear(KEY_ZOOMIN);              break;
        case 0x1020: lg_map_key_clear(KEY_ZOOMOUT);             break;
        case 0x1021: lg_map_key_clear(KEY_ZOOMRESET);           break;
@@ -147,6 +151,11 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage,
        case 0x1029: lg_map_key_clear(KEY_SHUFFLE);             break;
        case 0x102a: lg_map_key_clear(KEY_BACK);                break;
        case 0x102b: lg_map_key_clear(KEY_CYCLEWINDOWS);        break;
+       case 0x102d: lg_map_key_clear(KEY_WWW);                 break;
+       /* The following two are 'Start/answer call' and 'End/reject call'
+          on the MX3200 */
+       case 0x1031: lg_map_key_clear(KEY_OK);                  break;
+       case 0x1032: lg_map_key_clear(KEY_CANCEL);              break;
        case 0x1041: lg_map_key_clear(KEY_BATTERY);             break;
        case 0x1042: lg_map_key_clear(KEY_WORDPROCESSOR);       break;
        case 0x1043: lg_map_key_clear(KEY_SPREADSHEET);         break;