Merge commit 'v2.6.39-rc6' into x86/cleanups

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

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f6037b2..064f621 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,6 +6,7 @@ config FRV
        select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
        select HAVE_GENERIC_HARDIRQS
+       select GENERIC_IRQ_SHOW
 
 config ZONE_DMA
        bool
@@ -361,7 +362,6 @@ menu "Power management options"
 
 config ARCH_SUSPEND_POSSIBLE
        def_bool y
-       depends on !SMP
 
 source kernel/power/Kconfig
 endmenu