aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2012-04-16 17:53:44 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-04-19 14:33:23 -0400
commit37e74beb8ac95f1abd8d08d005c55cb9af7db9a5 (patch)
treeed55a12ee9fd7f8a18d2ed51b61f54ecbd71985d /arch/arm/Kconfig
parent4542b6a0fa6b48d9ae6b41c1efeb618b7a221b2a (diff)
ARM: 7388/1: Kconfig: Remove duplicate IRQ Kconfig entries
These kconfig entries are already defined in kernel/irq/Kconfig so select them instead of redefining them. Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf006d40342c..44e05347f766 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -30,6 +30,8 @@ config ARM
30 select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) 30 select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
31 select HAVE_C_RECORDMCOUNT 31 select HAVE_C_RECORDMCOUNT
32 select HAVE_GENERIC_HARDIRQS 32 select HAVE_GENERIC_HARDIRQS
33 select HARDIRQS_SW_RESEND
34 select GENERIC_IRQ_PROBE
33 select GENERIC_IRQ_SHOW 35 select GENERIC_IRQ_SHOW
34 select CPU_PM if (SUSPEND || CPU_IDLE) 36 select CPU_PM if (SUSPEND || CPU_IDLE)
35 select GENERIC_PCI_IOMAP 37 select GENERIC_PCI_IOMAP
@@ -126,14 +128,6 @@ config TRACE_IRQFLAGS_SUPPORT
126 bool 128 bool
127 default y 129 default y
128 130
129config HARDIRQS_SW_RESEND
130 bool
131 default y
132
133config GENERIC_IRQ_PROBE
134 bool
135 default y
136
137config GENERIC_LOCKBREAK 131config GENERIC_LOCKBREAK
138 bool 132 bool
139 default y 133 default y