Merge commit 'v2.6.31-rc1' into dmaengine

[firefly-linux-kernel-4.4.55.git] / arch / blackfin / mach-bf538 / Kconfig

diff --git a/arch/blackfin/mach-bf538/Kconfig b/arch/blackfin/mach-bf538/Kconfig
index f068c3523cdc716ab04806f2d2dd4fafbcbd5afc..2d280f504ab0a829178366118cb116b07248e42f 100644 (file)
--- a/arch/blackfin/mach-bf538/Kconfig
+++ b/arch/blackfin/mach-bf538/Kconfig
@@ -57,6 +57,7 @@ config IRQ_UART0_TX
        default 10
 config IRQ_TIMER0
        int "IRQ_TIMER0"
+       default 7 if TICKSOURCE_GPTMR0
        default 8
 config IRQ_TIMER1
        int "IRQ_TIMER1"