patch-2.1.15 linux/drivers/char/psaux.c

• Lines: 24
• Date: Thu Dec 12 16:51:09 1996
• Orig file: v2.1.14/linux/drivers/char/psaux.c
• Orig date: Tue Oct 29 19:58:06 1996

diff -u --recursive --new-file v2.1.14/linux/drivers/char/psaux.c linux/drivers/char/psaux.c
@@ -270,7 +270,11 @@
 	poll_aux_status();
 	/* reenable kbd bh */
 	enable_bh(KEYBOARD_BH);
+#ifdef CONFIG_MCA
+	free_irq(AUX_IRQ, inode);
+#else
 	free_irq(AUX_IRQ, NULL);
+#endif
 	MOD_DEC_USE_COUNT;
 }
 
@@ -319,7 +323,11 @@
 		return -EBUSY;
 	}
 	queue->head = queue->tail = 0;		/* Flush input queue */
+#ifdef CONFIG_MCA
+	if (request_irq(AUX_IRQ, aux_interrupt, MCA_bus ? SA_SHIRQ : 0, "PS/2 Mouse", inode)) {
+#else
 	if (request_irq(AUX_IRQ, aux_interrupt, 0, "PS/2 Mouse", NULL)) {
+#endif
 		aux_count--;
 		return -EBUSY;
 	}