From 025bd61401d63bae2884e05b165e610ad1cb1aba Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 19 Jul 2006 21:04:04 -0700
Subject: [PATCH] --- yaml --- r: 32771 b: refs/heads/master c:
 b77d35b7229164304d6fb8f047b9bcd3da2c9592 h: refs/heads/master i:   32769:
 fcd8f15909bbcb4ed2b2371027f01695934ec6c9   32767:
 5ae4f0356026b0363efef5eff8fdbdc7fb85add4 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/serial/sunzilog.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4c00db460229..19f2d3946673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b3c848cc89e62904e6d9c8f9fed13d5c225572d
+refs/heads/master: b77d35b7229164304d6fb8f047b9bcd3da2c9592
diff --git a/trunk/drivers/serial/sunzilog.c b/trunk/drivers/serial/sunzilog.c
index 496810c50947..18df10f49aff 100644
--- a/trunk/drivers/serial/sunzilog.c
+++ b/trunk/drivers/serial/sunzilog.c
@@ -1351,16 +1351,8 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
 
 	rp = sunzilog_chip_regs[inst];
 
-	if (zilog_irq == -1) {
+	if (zilog_irq == -1)
 		zilog_irq = op->irqs[0];
-		err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
-				  "zs", sunzilog_irq_chain);
-		if (err) {
-			of_iounmap(rp, sizeof(struct zilog_layout));
-
-			return err;
-		}
-	}
 
 	up = &sunzilog_port_table[inst * 2];