Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 0f34ec5..672c216 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -31,8 +31,10 @@ config BLACKFIN
        select HAVE_OPROFILE
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_GENERIC_HARDIRQS
+       select GENERIC_ATOMIC64
        select GENERIC_IRQ_PROBE
        select IRQ_PER_CPU if SMP
+       select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config GENERIC_CSUM
        def_bool y
@@ -850,7 +852,6 @@ config CPLB_SWITCH_TAB_L1
 config ICACHE_FLUSH_L1
        bool "Locate icache flush funcs in L1 Inst Memory"
        default y
-       depends on !SMP
        help
          If enabled, the Blackfin icache flushing functions are linked
          into L1 instruction memory.