summaryrefslogtreecommitdiffstats
path: root/arch/frv/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-26 15:05:39 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-26 15:05:39 +0200
commit31d44b57c508971c083ce038d7c5ededd09cea01 (patch)
tree249689625896d65894f56763c22f726e39fde5ec /arch/frv/Kconfig
parent885f42e1f466c36e3663d912a831e940f01a112b (diff)
parent1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff)
downloadop-kernel-dev-31d44b57c508971c083ce038d7c5ededd09cea01.zip
op-kernel-dev-31d44b57c508971c083ce038d7c5ededd09cea01.tar.gz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/frv/Kconfig')
-rw-r--r--arch/frv/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f6037b2..6db8aea 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,6 +6,8 @@ config FRV
select HAVE_IRQ_WORK
select HAVE_PERF_EVENTS
select HAVE_GENERIC_HARDIRQS
+ select GENERIC_IRQ_SHOW
+ select GENERIC_HARDIRQS_NO_DEPRECATED
config ZONE_DMA
bool
@@ -361,7 +363,6 @@ menu "Power management options"
config ARCH_SUSPEND_POSSIBLE
def_bool y
- depends on !SMP
source kernel/power/Kconfig
endmenu
OpenPOWER on IntegriCloud