diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /arch/blackfin/mach-bf527/Kconfig | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'arch/blackfin/mach-bf527/Kconfig')
| -rw-r--r-- | arch/blackfin/mach-bf527/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf527/Kconfig b/arch/blackfin/mach-bf527/Kconfig index 8438ec6d6679..848ac6f86823 100644 --- a/arch/blackfin/mach-bf527/Kconfig +++ b/arch/blackfin/mach-bf527/Kconfig | |||
| @@ -170,6 +170,7 @@ config IRQ_PORTH_INTB | |||
| 170 | default 11 | 170 | default 11 |
| 171 | config IRQ_TIMER0 | 171 | config IRQ_TIMER0 |
| 172 | int "IRQ_TIMER0" | 172 | int "IRQ_TIMER0" |
| 173 | default 7 if TICKSOURCE_GPTMR0 | ||
| 173 | default 8 | 174 | default 8 |
| 174 | config IRQ_TIMER1 | 175 | config IRQ_TIMER1 |
| 175 | int "IRQ_TIMER1" | 176 | int "IRQ_TIMER1" |