1 files changed, 10 insertions, 6 deletions

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 51ffafae561e..6e53d97abd3f 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -236,7 +236,6 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         u32 intr_index;
         u32 have_shift = 0;
         struct fsl_msi_cascade_data *cascade_data;
-        unsigned int ret;
 
         cascade_data = irq_get_handler_data(irq);
         msi_data = cascade_data->msi_data;
@@ -268,7 +267,9 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         case FSL_PIC_IP_IPIC:
                 msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4);
                 break;
-        case FSL_PIC_IP_VMPIC:
+#ifdef CONFIG_EPAPR_PARAVIRT
+        case FSL_PIC_IP_VMPIC: {
+                unsigned int ret;
                 ret = fh_vmpic_get_msir(virq_to_hw(irq), &msir_value);
                 if (ret) {
                         pr_err("fsl-msi: fh_vmpic_get_msir() failed for "
@@ -277,6 +278,8 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 }
                 break;
         }
+#endif
+        }
 
         while (msir_value) {
                 intr_index = ffs(msir_value) - 1;
@@ -330,9 +333,8 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)
         return 0;
 }
 
-static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
-                                         struct platform_device *dev,
-                                         int offset, int irq_index)
+static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
+                               int offset, int irq_index)
 {
         struct fsl_msi_cascade_data *cascade_data = NULL;
         int virt_msir;
@@ -360,7 +362,7 @@ static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
 }
 
 static const struct of_device_id fsl_of_msi_ids[];
-static int __devinit fsl_of_msi_probe(struct platform_device *dev)
+static int fsl_of_msi_probe(struct platform_device *dev)
 {
         const struct of_device_id *match;
         struct fsl_msi *msi;
@@ -508,10 +510,12 @@ static const struct of_device_id fsl_of_msi_ids[] = {
                 .compatible = "fsl,ipic-msi",
                 .data = &ipic_msi_feature,
         },
+#ifdef CONFIG_EPAPR_PARAVIRT
         {
                 .compatible = "fsl,vmpic-msi",
                 .data = &vmpic_msi_feature,
         },
+#endif
         {}
 };