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

[linux-drm-fsl-dcu.git] / drivers / crypto / caam / ctrl.c

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 52cd6c1b71fc5b7028aad1f99df0532ce1730d14..63fb1af2c43187fe398663869b5877fa16bf8834 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -5,6 +5,9 @@
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
  */
 
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
 #include "compat.h"
 #include "regs.h"
 #include "intern.h"
@@ -417,7 +420,7 @@ static int caam_probe(struct platform_device *pdev)
        topregs = (struct caam_full __iomem *)ctrl;
 
        /* Get the IRQ of the controller (for security violations only) */
-       ctrlpriv->secvio_irq = of_irq_to_resource(nprop, 0, NULL);
+       ctrlpriv->secvio_irq = irq_of_parse_and_map(nprop, 0);
 
        /*
         * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,