projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 080fc66)
ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE
authorStephen Boyd <sboyd@codeaurora.org>
Mon, 13 Aug 2012 18:57:31 +0000 (19:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Aug 2012 09:46:51 +0000 (10:46 +0100)
Seems that Thomas' and my patches collided during the last merge
window.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig patch | blob | blame | history

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e4191ccbdb7ac1cd92498072ee7b4846e9e14a4e..6d6e18fee9fe08bacf876e749837d4b0156a5fd9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -38,7 +38,6 @@ config ARM
        select HARDIRQS_SW_RESEND
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
-       select GENERIC_IRQ_PROBE
        select ARCH_WANT_IPC_PARSE_VERSION
        select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)
Motorola kernel-slsi