Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / pata_mpc52xx.c

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 50c56e2814c1e0c6a777ed7ef80534d8e9012d73..5413ebfa72e5baacd72ad9af80df6d58859aeb63 100644 (file)
--- 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;
@@ -494,10 +494,8 @@ mpc52xx_ata_resume(struct of_device *op)
 
 
 static struct of_device_id mpc52xx_ata_of_match[] = {
-       {
-               .type           = "ata",
-               .compatible     = "mpc5200-ata",
-       },
+       { .compatible = "fsl,mpc5200-ata", },
+       { .compatible = "mpc5200-ata", },
        {},
 };