summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2012-08-13 20:57:31 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-08-15 11:46:51 +0200
commit89868730a756feca7e4b21a97c86487cd565ed22 (patch)
tree40850f3a4efd453f763f438268fd649ae4d40bcc /arch
parentARM: Bring back ARMv3 IO and user access code (diff)
downloadlinux-89868730a756feca7e4b21a97c86487cd565ed22.tar.xz
linux-89868730a756feca7e4b21a97c86487cd565ed22.zip
ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e4191ccbdb7a..6d6e18fee9fe 100644
--- 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)