[ARM] 3816/1: iop3xx: rename config symbols

[linux-drm-fsl-dcu.git] / arch / arm / oprofile / op_model_xscale.c

diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c
index e0f0b320d76cda9129bb7fcd675b9f08b2f080f9..7e0cc5b15b159626ee9421fe0f1b5dae262e32af 100644 (file)
--- a/arch/arm/oprofile/op_model_xscale.c
+++ b/arch/arm/oprofile/op_model_xscale.c
@@ -36,10 +36,10 @@
 #ifdef CONFIG_ARCH_IOP310
 #define XSCALE_PMU_IRQ  IRQ_XS80200_PMU
 #endif
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
 #define XSCALE_PMU_IRQ  IRQ_IOP321_CORE_PMU
 #endif
-#ifdef CONFIG_ARCH_IOP331
+#ifdef CONFIG_ARCH_IOP33X
 #define XSCALE_PMU_IRQ  IRQ_IOP331_CORE_PMU
 #endif
 #ifdef CONFIG_ARCH_PXA
@@ -384,7 +384,7 @@ static int xscale_pmu_start(void)
        int ret;
        u32 pmnc = read_pmnc();
 
-       ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, SA_INTERRUPT,
+       ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, IRQF_DISABLED,
                        "XScale PMU", (void *)results);
 
        if (ret < 0) {