From c6e6c53329dddc597097dddadfb1ca661b750fc4 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 11 Oct 2007 00:49:56 -0400 Subject: [PATCH] --- yaml --- r: 69381 b: refs/heads/master c: 1ea3abf7fbc39b3b543d7438159ba07b6411561c h: refs/heads/master i: 69379: 48b4762915613b4197f902f4acf23c21840fc559 v: v3 --- [refs] | 2 +- trunk/include/linux/keyboard.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 079364b75d3c..139f90b420d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a402b649d9c4f5ac17c1368702c9f51219c484b +refs/heads/master: 1ea3abf7fbc39b3b543d7438159ba07b6411561c diff --git a/trunk/include/linux/keyboard.h b/trunk/include/linux/keyboard.h index de76843bbe8a..f892b272f3ff 100644 --- a/trunk/include/linux/keyboard.h +++ b/trunk/include/linux/keyboard.h @@ -416,6 +416,7 @@ extern unsigned short plain_map[NR_KEYS]; #define K_SHIFTRLOCK K(KT_LOCK,KG_SHIFTR) #define K_CTRLLLOCK K(KT_LOCK,KG_CTRLL) #define K_CTRLRLOCK K(KT_LOCK,KG_CTRLR) +#define K_CAPSSHIFTLOCK K(KT_LOCK,KG_CAPSSHIFT) #define K_SHIFT_SLOCK K(KT_SLOCK,KG_SHIFT) #define K_CTRL_SLOCK K(KT_SLOCK,KG_CTRL) @@ -425,8 +426,9 @@ extern unsigned short plain_map[NR_KEYS]; #define K_SHIFTR_SLOCK K(KT_SLOCK,KG_SHIFTR) #define K_CTRLL_SLOCK K(KT_SLOCK,KG_CTRLL) #define K_CTRLR_SLOCK K(KT_SLOCK,KG_CTRLR) +#define K_CAPSSHIFT_SLOCK K(KT_SLOCK,KG_CAPSSHIFT) -#define NR_LOCK 8 +#define NR_LOCK 9 #define K_BRL_BLANK K(KT_BRL, 0) #define K_BRL_DOT1 K(KT_BRL, 1)