Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_msi.c

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 7e2b2f2e3ecde13f9e95c88801297d09c49a2583..63c5f04ea580177649aba38d101cb3f86b40cb35 100644 (file)
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -371,7 +371,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
        int err, i, j, irq_index, count;
        int rc;
        const u32 *p;
-       struct fsl_msi_feature *features;
+       const struct fsl_msi_feature *features;
        int len;
        u32 offset;
        static const u32 all_avail[] = { 0, NR_MSI_IRQS };
@@ -505,16 +505,16 @@ static const struct fsl_msi_feature vmpic_msi_feature = {
 static const struct of_device_id fsl_of_msi_ids[] = {
        {
                .compatible = "fsl,mpic-msi",
-               .data = (void *)&mpic_msi_feature,
+               .data = &mpic_msi_feature,
        },
        {
                .compatible = "fsl,ipic-msi",
-               .data = (void *)&ipic_msi_feature,
+               .data = &ipic_msi_feature,
        },
 #ifdef CONFIG_EPAPR_PARAVIRT
        {
                .compatible = "fsl,vmpic-msi",
-               .data = (void *)&vmpic_msi_feature,
+               .data = &vmpic_msi_feature,
        },
 #endif
        {}