Merge branch 'linux-2.6'

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 1a7ca37168b2..5413ebfa72e5 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/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;