Merge branch 'fix/hda' into topic/hda

1 files changed, 16 insertions, 1 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index 7323d2ff5151..1a958cd90ce9 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -238,6 +238,7 @@ struct input_absinfo {
 #define KEY_KPEQUAL             117
 #define KEY_KPPLUSMINUS         118
 #define KEY_PAUSE               119
+#define KEY_SCALE               120     /* AL Compiz Scale (Expose) */
 
 #define KEY_KPCOMMA             121
 #define KEY_HANGEUL             122
@@ -322,6 +323,7 @@ struct input_absinfo {
 #define KEY_PAUSECD             201
 #define KEY_PROG3               202
 #define KEY_PROG4               203
+#define KEY_DASHBOARD           204     /* AL Dashboard */
 #define KEY_SUSPEND             205
 #define KEY_CLOSE               206     /* AC Close */
 #define KEY_PLAY                207
@@ -577,9 +579,22 @@ struct input_absinfo {
 #define KEY_BRL_DOT9            0x1f9
 #define KEY_BRL_DOT10           0x1fa
 
+#define KEY_NUMERIC_0           0x200   /* used by phones, remote controls, */
+#define KEY_NUMERIC_1           0x201   /* and other keypads */
+#define KEY_NUMERIC_2           0x202
+#define KEY_NUMERIC_3           0x203
+#define KEY_NUMERIC_4           0x204
+#define KEY_NUMERIC_5           0x205
+#define KEY_NUMERIC_6           0x206
+#define KEY_NUMERIC_7           0x207
+#define KEY_NUMERIC_8           0x208
+#define KEY_NUMERIC_9           0x209
+#define KEY_NUMERIC_STAR        0x20a
+#define KEY_NUMERIC_POUND       0x20b
+
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING     KEY_MUTE
-#define KEY_MAX                 0x1ff
+#define KEY_MAX                 0x2ff
 #define KEY_CNT                 (KEY_MAX+1)
 
 /*