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
/
dz.c
diff --git
a/drivers/serial/dz.c
b/drivers/serial/dz.c
index
bf71bad
..
8a98aae
100644
(file)
--- a/
drivers/serial/dz.c
+++ b/
drivers/serial/dz.c
@@
-26,7
+26,6
@@
#undef DEBUG_DZ
#undef DEBUG_DZ
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/init.h>
@@
-674,7
+673,7
@@
static void dz_reset(struct dz_port *dport)
}
#ifdef CONFIG_SERIAL_DZ_CONSOLE
}
#ifdef CONFIG_SERIAL_DZ_CONSOLE
-static void dz_console_putchar(struct uart_port *port, int ch)
+static void dz_console_putchar(struct uart_port *
u
port, int ch)
{
struct dz_port *dport = (struct dz_port *)uport;
unsigned long flags;
{
struct dz_port *dport = (struct dz_port *)uport;
unsigned long flags;
@@
-768,11
+767,7
@@
void __init dz_serial_console_init(void)
static struct uart_driver dz_reg = {
.owner = THIS_MODULE,
.driver_name = "serial",
static struct uart_driver dz_reg = {
.owner = THIS_MODULE,
.driver_name = "serial",
-#ifdef CONFIG_DEVFS
- .dev_name = "tts/%d",
-#else
.dev_name = "ttyS%d",
.dev_name = "ttyS%d",
-#endif
.major = TTY_MAJOR,
.minor = 64,
.nr = DZ_NB_PORT,
.major = TTY_MAJOR,
.minor = 64,
.nr = DZ_NB_PORT,
@@
-802,7
+797,7
@@
int __init dz_init(void)
restore_flags(flags);
if (request_irq(dz_ports[0].port.irq, dz_interrupt,
restore_flags(flags);
if (request_irq(dz_ports[0].port.irq, dz_interrupt,
-
SA_INTERRUPT
, "DZ", &dz_ports[0]))
+
IRQF_DISABLED
, "DZ", &dz_ports[0]))
panic("Unable to register DZ interrupt");
ret = uart_register_driver(&dz_reg);
panic("Unable to register DZ interrupt");
ret = uart_register_driver(&dz_reg);