Merge branch 'tracing/urgent' into tracing/core

[~andy/linux] / arch / blackfin / mach-bf527 / Kconfig

diff --git a/arch/blackfin/mach-bf527/Kconfig b/arch/blackfin/mach-bf527/Kconfig
index 8438ec6d6679007fe115f8dd9fc4f477d9befeda..848ac6f868231d42044209a71c48a46c806d96e0 100644 (file)
--- a/arch/blackfin/mach-bf527/Kconfig
+++ b/arch/blackfin/mach-bf527/Kconfig
@@ -170,6 +170,7 @@ config IRQ_PORTH_INTB
        default 11
 config IRQ_TIMER0
        int "IRQ_TIMER0"
+       default 7 if TICKSOURCE_GPTMR0
        default 8
 config IRQ_TIMER1
        int "IRQ_TIMER1"