Merge

0cb32850 · Vojtech Pavlik · 28ca0df8 · 3d925dcc · 0cb32850
Commit 0cb32850 authored Jun 13, 2003 by Vojtech Pavlik
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

drivers/char/keyboard.c drivers/char/keyboard.c +5 -3

No files found.
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -52,11 +52,13 @@ extern void ctrl_alt_del(void);
 /*
 * Some laptops take the 789uiojklm,. keys as number pad when NumLock is on.
- * This seems a good reason to start with NumLock off. On PC9800 however there
+ * This seems a good reason to start with NumLock off. On PC9800 and HIL keyboards 
- * is no NumLock key and everyone expects the keypad to be used for numbers.
+ * of PARISC machines however there is no NumLock key and everyone expects the keypad 
+ * to be used for numbers.
 */
-#ifdef CONFIG_X86_PC9800
+#if defined(CONFIG_X86_PC9800) || \
+    defined(CONFIG_PARISC) && (defined(CONFIG_KEYBOARD_HIL) || defined(CONFIG_KEYBOARD_HIL_OLD))
 #define KBD_DEFLEDS (1 << VC_NUMLOCK)
 #else
 #define KBD_DEFLEDS 0