Merge commit 'origin/master' into next

[linux-2.6-omap-h63xx.git] / arch / blackfin / mach-bf527 / Kconfig

diff --git a/arch/blackfin/mach-bf527/Kconfig b/arch/blackfin/mach-bf527/Kconfig
index 3cde4beeb214df7554b1f9490d750b86cd55a038..8438ec6d6679007fe115f8dd9fc4f477d9befeda 100644 (file)
--- a/arch/blackfin/mach-bf527/Kconfig
+++ b/arch/blackfin/mach-bf527/Kconfig
@@ -168,29 +168,29 @@ config IRQ_MAC_TX
 config IRQ_PORTH_INTB
        int "IRQ_PORTH_INTB"
        default 11
-config IRQ_TMR0
-       int "IRQ_TMR0"
-       default 12
-config IRQ_TMR1
-       int "IRQ_TMR1"
+config IRQ_TIMER0
+       int "IRQ_TIMER0"
+       default 8
+config IRQ_TIMER1
+       int "IRQ_TIMER1"
        default 12
-config IRQ_TMR2
-       int "IRQ_TMR2"
+config IRQ_TIMER2
+       int "IRQ_TIMER2"
        default 12
-config IRQ_TMR3
-       int "IRQ_TMR3"
+config IRQ_TIMER3
+       int "IRQ_TIMER3"
        default 12
-config IRQ_TMR4
-       int "IRQ_TMR4"
+config IRQ_TIMER4
+       int "IRQ_TIMER4"
        default 12
-config IRQ_TMR5
-       int "IRQ_TMR5"
+config IRQ_TIMER5
+       int "IRQ_TIMER5"
        default 12
-config IRQ_TMR6
-       int "IRQ_TMR6"
+config IRQ_TIMER6
+       int "IRQ_TIMER6"
        default 12
-config IRQ_TMR7
-       int "IRQ_TMR7"
+config IRQ_TIMER7
+       int "IRQ_TIMER7"
        default 12
 config IRQ_PORTG_INTA
        int "IRQ_PORTG_INTA"