diff --git a/[refs] b/[refs]
index cc6d54a400b3..2ef4d88d7e1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3596bb929f2abd3433c2eaa5755fad48ac207af1
+refs/heads/master: 6c30d5a53229aad22bb675e0bd6eb518ecaa4316
diff --git a/trunk/drivers/hid/hid-chicony.c b/trunk/drivers/hid/hid-chicony.c
index 4162505793c5..b99af346fdff 100644
--- a/trunk/drivers/hid/hid-chicony.c
+++ b/trunk/drivers/hid/hid-chicony.c
@@ -49,6 +49,8 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 	case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);	break;
 	case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);	break;
 	case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF);	break;
+	case 0x00f7: ch_map_key_clear(KEY_CAMERA);	break;
+	case 0x00f8: ch_map_key_clear(KEY_PROG1);	break;
 	default:
 		return 0;
 	}