From ca28bf35131bbe4eea7ee5826c557ccfc6226d01 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Sat, 19 Jan 2008 15:48:59 +0000
Subject: [PATCH] --- yaml --- r: 76926 b: refs/heads/master c:
 0eaea364edec4132fe42ef33fe87edb15f00507b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ata/pata_mpc52xx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef006a05c852..6fd01a5a3c6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75f9cafc2d24a1cf44d7c3f3e5b4f7a393afcf71
+refs/heads/master: 0eaea364edec4132fe42ef33fe87edb15f00507b
diff --git a/trunk/drivers/ata/pata_mpc52xx.c b/trunk/drivers/ata/pata_mpc52xx.c
index 50c56e2814c1..dc401626cdb2 100644
--- a/trunk/drivers/ata/pata_mpc52xx.c
+++ b/trunk/drivers/ata/pata_mpc52xx.c
@@ -364,7 +364,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
 {
 	unsigned int ipb_freq;
 	struct resource res_mem;
-	int ata_irq = NO_IRQ;
+	int ata_irq;
 	struct mpc52xx_ata __iomem *ata_regs;
 	struct mpc52xx_ata_priv *priv;
 	int rv;