patch-2.4.10 linux/drivers/char/sx.c

• Lines: 34
• Date: Fri Sep 7 09:28:38 2001
• Orig file: v2.4.9/linux/drivers/char/sx.c
• Orig date: Wed Jul 25 17:10:20 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/char/sx.c linux/drivers/char/sx.c
@@ -365,6 +365,8 @@
 MODULE_PARM(sx_debug, "i");
 MODULE_PARM(sx_irqmask, "i");
 
+MODULE_LICENSE("GPL");
+
 static struct real_driver sx_real_driver = {
 	sx_disable_tx_interrupts,
 	sx_enable_tx_interrupts,
@@ -1139,7 +1141,7 @@
 		sx_dprintk (SX_DEBUG_MODEMSIGNALS, "got a break.\n");
 
 		sx_write_channel_byte (port, hi_state, hi_state);
-		gs_got_break (port);
+		gs_got_break (&port->gs);
 	}
 	if (hi_state & ST_DCD) {
 		hi_state &= ~ST_DCD;
@@ -1614,6 +1616,7 @@
 #define R0         if (read_sx_word (board, i) != 0x55aa) return 1
 #define R1         if (read_sx_word (board, i) != 0xaa55) return 1
 
+#if 0
 /* This memtest takes a human-noticable time. You normally only do it
    once a boot, so I guess that it is worth it. */
 static int do_memtest_w (struct sx_board *board, int min, int max)
@@ -1628,6 +1631,7 @@
 
 	return 0;
 }
+#endif
 
 
 static int sx_fw_ioctl (struct inode *inode, struct file *filp,