1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 8e916e76b7b5..da4415842a43 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -43,8 +43,8 @@
 #endif
 
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
 
-#include "suncore.h"
 #include "sunzilog.h"
 
 /* On 32-bit sparcs we need to delay after register accesses
@@ -1397,7 +1397,7 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
 #endif
 }
 
-static int zilog_irq = -1;
+static int zilog_irq;
 
 static int __devinit zs_probe(struct platform_device *op)
 {
@@ -1425,7 +1425,7 @@ static int __devinit zs_probe(struct platform_device *op)
 
         rp = sunzilog_chip_regs[inst];
 
-        if (zilog_irq == -1)
+        if (!zilog_irq)
                 zilog_irq = op->archdata.irqs[0];
 
         up = &sunzilog_port_table[inst * 2];
@@ -1580,7 +1580,7 @@ static int __init sunzilog_init(void)
         if (err)
                 goto out_unregister_uart;
 
-        if (zilog_irq != -1) {
+        if (!zilog_irq) {
                 struct uart_sunzilog_port *up = sunzilog_irq_chain;
                 err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
                                   "zs", sunzilog_irq_chain);
@@ -1621,7 +1621,7 @@ static void __exit sunzilog_exit(void)
 {
         platform_driver_unregister(&zs_driver);
 
-        if (zilog_irq != -1) {
+        if (!zilog_irq) {
                 struct uart_sunzilog_port *up = sunzilog_irq_chain;
 
                 /* Disable Interrupts */
@@ -1637,7 +1637,7 @@ static void __exit sunzilog_exit(void)
                 }
 
                 free_irq(zilog_irq, sunzilog_irq_chain);
-                zilog_irq = -1;
+                zilog_irq = 0;
         }
 
         if (sunzilog_reg.nr) {