forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source 
Conflicts:

	drivers/macintosh/adbhid.c
This commit is contained in:
Dmitry Torokhov 2007-10-12 21:27:47 -04:00
commit b981d8b3f5
7628 changed files with 537075 additions and 239356 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/keyboard.h
View file

@ -439,8 +439,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