Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv29207/drivers/char
Modified Files:
serial_tx3912.c
Log Message:
Nino updates.
Index: serial_tx3912.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial_tx3912.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serial_tx3912.c 2001/10/22 19:20:09 1.5
+++ serial_tx3912.c 2001/10/26 22:30:51 1.6
@@ -18,13 +18,13 @@
#include <linux/ptrace.h>
#include <linux/init.h>
#include <linux/console.h>
-#include <linux/serial.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/malloc.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/pm.h>
+#include <linux/serial.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
@@ -904,18 +904,17 @@
rc = rs_init_portstructs ();
rs_init_drivers ();
- if (request_irq(2, rs_tx_interrupt_uarta, SA_SHIRQ | SA_INTERRUPT,
+ if (request_irq(2, rs_tx_interrupt_uarta, SA_INTERRUPT,
"serial", &rs_ports[0])) {
printk(KERN_ERR "rs: Cannot allocate irq for UARTA.\n");
rc = 0;
}
- if (request_irq(3, rs_rx_interrupt_uarta, SA_SHIRQ | SA_INTERRUPT,
+ if (request_irq(3, rs_rx_interrupt_uarta, SA_INTERRUPT,
"serial", &rs_ports[0])) {
printk(KERN_ERR "rs: Cannot allocate irq for UARTA.\n");
rc = 0;
}
- IntEnable6 |= INT6_UARTARXINT;
rs_enable_rx_interrupts(&rs_ports[0]);
#ifndef CONFIG_SERIAL_TX3912_CONSOLE
|
