aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/pmac_zilog.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
-rw-r--r--drivers/serial/pmac_zilog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 513ff8597707..459c0231aef3 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -42,7 +42,6 @@
42#undef DEBUG_HARD 42#undef DEBUG_HARD
43#undef USE_CTRL_O_SYSRQ 43#undef USE_CTRL_O_SYSRQ
44 44
45#include <linux/config.h>
46#include <linux/module.h> 45#include <linux/module.h>
47#include <linux/tty.h> 46#include <linux/tty.h>
48 47
@@ -101,7 +100,6 @@ static DEFINE_MUTEX(pmz_irq_mutex);
101static struct uart_driver pmz_uart_reg = { 100static struct uart_driver pmz_uart_reg = {
102 .owner = THIS_MODULE, 101 .owner = THIS_MODULE,
103 .driver_name = "ttyS", 102 .driver_name = "ttyS",
104 .devfs_name = "tts/",
105 .dev_name = "ttyS", 103 .dev_name = "ttyS",
106 .major = TTY_MAJOR, 104 .major = TTY_MAJOR,
107}; 105};
@@ -936,7 +934,7 @@ static int pmz_startup(struct uart_port *port)
936 } 934 }
937 935
938 pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON; 936 pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
939 if (request_irq(uap->port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) { 937 if (request_irq(uap->port.irq, pmz_interrupt, IRQF_SHARED, "PowerMac Zilog", uap)) {
940 dev_err(&uap->dev->ofdev.dev, 938 dev_err(&uap->dev->ofdev.dev,
941 "Unable to register zs interrupt handler.\n"); 939 "Unable to register zs interrupt handler.\n");
942 pmz_set_scc_power(uap, 0); 940 pmz_set_scc_power(uap, 0);