diff -urN linux2/drivers/char/hp_keyb.c linux/drivers/char/hp_keyb.c
--- linux2/drivers/char/hp_keyb.c	Thu Nov 16 17:39:03 2000
+++ linux/drivers/char/hp_keyb.c	Thu Nov 16 17:18:54 2000
@@ -70,12 +70,12 @@
 #define K_F8		0x42
 #define K_F9		0x43
 #define K_F10		0x44
-#define K_F11		87
-#define K_F12		88
+#define K_F11		0x57
+#define K_F12		0x58
 #define K_PRNT		0x54
-#define K_SCRL		70
-#define K_BRK		119
-#define K_AGR		K_NONE
+#define K_SCRL		0x46
+#define K_BRK		0x77
+#define K_AGR		0x29
 #define K_1		0x02
 #define K_2		0x03
 #define K_3		0x04
@@ -89,10 +89,10 @@
 #define K_MINS		0x0c
 #define K_EQLS		0x0d
 #define K_BKSP		0x0e
-#define K_INS		110
-#define K_HOME		102
-#define K_PGUP		104
-#define K_NUML		69
+#define K_INS		0x6e
+#define K_HOME		0x66
+#define K_PGUP		0x68
+#define K_NUML		0x45
 #define KP_SLH		0x62
 #define KP_STR		0x37
 #define KP_MNS		0x4a
@@ -111,13 +111,13 @@
 #define K_RSBK		0x1b
 #define K_ENTR		0x1c
 #define K_DEL		111
-#define K_END		107
-#define K_PGDN		109
+#define K_END		0x6b
+#define K_PGDN		0x6d
 #define KP_7		0x47
 #define KP_8		0x48
 #define KP_9		0x49
-#define KP_PLS		118
-#define K_CAPS		58
+#define KP_PLS		0x4e
+#define K_CAPS		0x3a
 #define K_A		0x1e
 #define K_S		0x1f
 #define K_D		0x20
@@ -146,7 +146,7 @@
 #define K_DOT		0x34
 #define K_FSLH		0x35
 #define K_RSFT		0x36
-#define K_UP		103	
+#define K_UP		0x67
 #define KP_1		0x4f
 #define KP_2		0x50
 #define KP_3		0x51
@@ -156,11 +156,11 @@
 #define K_SPCE		0x39
 #define K_RALT		0x64
 #define K_RCTL		0x61
-#define K_LEFT		105
-#define K_DOWN		108
-#define K_RGHT		106
-#define KP_0		82
-#define KP_DOT		83
+#define K_LEFT		0x69
+#define K_DOWN		0x6c
+#define K_RGHT		0x6a
+#define KP_0		0x52
+#define KP_DOT		0x53
 
 static unsigned char keycode_translate[256] =
 {
@@ -198,7 +198,7 @@
 
 /* ----- the following code stolen from pc_keyb.c */
 
-#ifdef CONFIG_MAGIC_SYSRQ
+
 unsigned char pckbd_sysrq_xlate[128] =
 	"\000\0331234567890-=\177\t"			/* 0x00 - 0x0f */
 	"qwertyuiop[]\r\000as"				/* 0x10 - 0x1f */
@@ -207,7 +207,6 @@
 	"\206\207\210\211\212\000\000789-456+1"		/* 0x40 - 0x4f */
 	"230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */
 	"\r\000/";					/* 0x60 - 0x6f */
-#endif
 
 /*
  * Translation of escaped scancodes to keycodes.