Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / blackfin / mach-bf561 / Kconfig

diff --git a/arch/blackfin/mach-bf561/Kconfig b/arch/blackfin/mach-bf561/Kconfig
index 3f4895450bea0286fcbbe8b5b8b512cb9c8a1434..638ec38ca47066ccc8fcfc15a294a00598934c2e 100644 (file)
--- a/arch/blackfin/mach-bf561/Kconfig
+++ b/arch/blackfin/mach-bf561/Kconfig
@@ -4,9 +4,9 @@ source "arch/blackfin/mach-bf561/boards/Kconfig"
 
 menu "BF561 Specific Configuration"
 
-comment "Core B Support"
+if (!SMP)
 
-menu "Core B Support"
+comment "Core B Support"
 
 config BF561_COREB
        bool "Enable Core B support"
@@ -25,7 +25,7 @@ config BF561_COREB_RESET
          0 is set, and will reset PC to 0xff600000 when
          COREB_SRAM_INIT is cleared.
 
-endmenu
+endif
 
 comment "Interrupt Priority Assignment"
 
@@ -138,7 +138,7 @@ config IRQ_DMA2_11
        default 9
 config IRQ_TIMER0
        int "TIMER 0  Interrupt"
-       default 10
+       default 8
 config IRQ_TIMER1
        int "TIMER 1  Interrupt"
        default 10