aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-12 07:57:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-12 07:57:00 -0700
commit532df780a2012ad75b3f078647f229c4dabd99d1 (patch)
tree6172d647f9c7bbd770bcd5f9f002108d671ce24f /include
parent577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (diff)
parent7b6dff982b063b1b15c30508f16863e5449e7229 (diff)
downloadlinux-linaro-532df780a2012ad75b3f078647f229c4dabd99d1.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: usbtouchscreen - correctly set 'phys' Input: i8042 - add HP Pavilion DV4270ca to the MUX blacklist Input: i8042 - fix modpost warning Input: add more Braille keycodes
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h2
-rw-r--r--include/linux/keyboard.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index cf2b5619aa1..36e00aa6f03 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -558,6 +558,8 @@ struct input_absinfo {
#define KEY_BRL_DOT6 0x1f6
#define KEY_BRL_DOT7 0x1f7
#define KEY_BRL_DOT8 0x1f8
+#define KEY_BRL_DOT9 0x1f9
+#define KEY_BRL_DOT10 0x1fa
/* We avoid low common keys in module aliases so they don't get huge. */
#define KEY_MIN_INTERESTING KEY_MUTE
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h
index de76843bbe8..7ddbc30aa8e 100644
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
@@ -437,8 +437,10 @@ extern unsigned short plain_map[NR_KEYS];
#define K_BRL_DOT6 K(KT_BRL, 6)
#define K_BRL_DOT7 K(KT_BRL, 7)
#define K_BRL_DOT8 K(KT_BRL, 8)
+#define K_BRL_DOT9 K(KT_BRL, 9)
+#define K_BRL_DOT10 K(KT_BRL, 10)
-#define NR_BRL 9
+#define NR_BRL 11
#define MAX_DIACR 256
#endif