Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-davinci / da850.c

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 6b8331b..68ed58a 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -643,7 +643,6 @@ static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_EVTOUT4]             = 7,
        [IRQ_DA8XX_EVTOUT5]             = 7,
        [IRQ_DA8XX_EVTOUT6]             = 7,
-       [IRQ_DA8XX_EVTOUT6]             = 7,
        [IRQ_DA8XX_EVTOUT7]             = 7,
        [IRQ_DA8XX_CCINT0]              = 7,
        [IRQ_DA8XX_CCERRINT]            = 7,
@@ -661,27 +660,7 @@ static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_TINT34_1]            = 7,
        [IRQ_DA8XX_UARTINT0]            = 7,
        [IRQ_DA8XX_KEYMGRINT]           = 7,
-       [IRQ_DA8XX_SECINT]              = 7,
-       [IRQ_DA8XX_SECKEYERR]           = 7,
        [IRQ_DA850_MPUADDRERR0]         = 7,
-       [IRQ_DA850_MPUPROTERR0]         = 7,
-       [IRQ_DA850_IOPUADDRERR0]        = 7,
-       [IRQ_DA850_IOPUPROTERR0]        = 7,
-       [IRQ_DA850_IOPUADDRERR1]        = 7,
-       [IRQ_DA850_IOPUPROTERR1]        = 7,
-       [IRQ_DA850_IOPUADDRERR2]        = 7,
-       [IRQ_DA850_IOPUPROTERR2]        = 7,
-       [IRQ_DA850_BOOTCFG_ADDR_ERR]    = 7,
-       [IRQ_DA850_BOOTCFG_PROT_ERR]    = 7,
-       [IRQ_DA850_MPUADDRERR1]         = 7,
-       [IRQ_DA850_MPUPROTERR1]         = 7,
-       [IRQ_DA850_IOPUADDRERR3]        = 7,
-       [IRQ_DA850_IOPUPROTERR3]        = 7,
-       [IRQ_DA850_IOPUADDRERR4]        = 7,
-       [IRQ_DA850_IOPUPROTERR4]        = 7,
-       [IRQ_DA850_IOPUADDRERR5]        = 7,
-       [IRQ_DA850_IOPUPROTERR5]        = 7,
-       [IRQ_DA850_MIOPU_BOOTCFG_ERR]   = 7,
        [IRQ_DA8XX_CHIPINT0]            = 7,
        [IRQ_DA8XX_CHIPINT1]            = 7,
        [IRQ_DA8XX_CHIPINT2]            = 7,
@@ -722,8 +701,6 @@ static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_EHRPWM1]             = 7,
        [IRQ_DA8XX_EHRPWM1TZ]           = 7,
        [IRQ_DA850_SATAINT]             = 7,
-       [IRQ_DA850_TINT12_2]            = 7,
-       [IRQ_DA850_TINT34_2]            = 7,
        [IRQ_DA850_TINTALL_2]           = 7,
        [IRQ_DA8XX_ECAP0]               = 7,
        [IRQ_DA8XX_ECAP1]               = 7,
@@ -751,8 +728,6 @@ static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA850_CCINT1]              = 7,
        [IRQ_DA850_CCERRINT1]           = 7,
        [IRQ_DA850_TCERRINT2]           = 7,
-       [IRQ_DA850_TINT12_3]            = 7,
-       [IRQ_DA850_TINT34_3]            = 7,
        [IRQ_DA850_TINTALL_3]           = 7,
        [IRQ_DA850_MCBSP0RINT]          = 7,
        [IRQ_DA850_MCBSP0XINT]          = 7,