Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[mv-sheeva.git] / arch / blackfin / mach-bf561 / Kconfig

diff --git a/arch/blackfin/mach-bf561/Kconfig b/arch/blackfin/mach-bf561/Kconfig
index 6965dd59af4c58c0c223916e702a2a8e18d4d3c4..cb97436415113f65725852e125af02d0197bc992 100644 (file)
--- a/arch/blackfin/mach-bf561/Kconfig
+++ b/arch/blackfin/mach-bf561/Kconfig
@@ -125,6 +125,7 @@ config IRQ_DMA2_11
        default 9
 config IRQ_TIMER0
        int "TIMER 0  Interrupt"
+       default 7 if TICKSOURCE_GPTMR0
        default 8
 config IRQ_TIMER1
        int "TIMER 1  Interrupt"