git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
serial
/
sn_console.c
diff --git
a/drivers/serial/sn_console.c
b/drivers/serial/sn_console.c
index
60ea4a3
..
2f148e5
100644
(file)
--- a/
drivers/serial/sn_console.c
+++ b/
drivers/serial/sn_console.c
@@
-37,7
+37,6
@@
* http://oss.sgi.com/projects/GenInfo/NoticeExplan
*/
* http://oss.sgi.com/projects/GenInfo/NoticeExplan
*/
-#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/interrupt.h>
#include <linux/tty.h>
#include <linux/serial.h>
@@
-649,7
+648,7
@@
static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static int sn_sal_connect_interrupt(struct sn_cons_port *port)
{
if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
static int sn_sal_connect_interrupt(struct sn_cons_port *port)
{
if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-
SA_INTERRUPT | SA_SHIRQ
,
+
IRQF_DISABLED | IRQF_SHARED
,
"SAL console driver", port) >= 0) {
return SGI_UART_VECTOR;
}
"SAL console driver", port) >= 0) {
return SGI_UART_VECTOR;
}