patch-2.1.127 linux/drivers/char/pc_keyb.c
Next file: linux/drivers/char/pcxx.c
Previous file: linux/drivers/char/n_tty.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Tue Nov 3 23:10:00 1998
- Orig file:
v2.1.126/linux/drivers/char/pc_keyb.c
- Orig date:
Fri Oct 23 22:01:20 1998
diff -u --recursive --new-file v2.1.126/linux/drivers/char/pc_keyb.c linux/drivers/char/pc_keyb.c
@@ -56,7 +56,7 @@
static void kbd_write(int address, int data);
-static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
+spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
/* used only by send_data - set by keyboard_interrupt */
static volatile unsigned char reply_expected = 0;
@@ -904,10 +904,18 @@
static int __init psaux_init(void)
{
+#if 0
+ /*
+ * Don't bother with the BIOS flag: even if we don't have
+ * a mouse connected at bootup we may still want to connect
+ * one later, and we don't want to just let the BIOS tell
+ * us that it has no mouse..
+ */
if (aux_device_present != 0xaa)
return -EIO;
printk(KERN_INFO "PS/2 auxiliary pointing device detected -- driver installed.\n");
+#endif
misc_register(&psaux_mouse);
queue = (struct aux_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
memset(queue, 0, sizeof(*queue));
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov