diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2012-08-13 14:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-08-15 05:46:51 -0400 |
| commit | 89868730a756feca7e4b21a97c86487cd565ed22 (patch) | |
| tree | 40850f3a4efd453f763f438268fd649ae4d40bcc /arch/arm | |
| parent | 080fc66fb5b6feae19fbbe8c6cbd7b11a4dac636 (diff) | |
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/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e4191ccbdb7..6d6e18fee9f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -38,7 +38,6 @@ config ARM | |||
| 38 | select HARDIRQS_SW_RESEND | 38 | select HARDIRQS_SW_RESEND |
| 39 | select GENERIC_IRQ_PROBE | 39 | select GENERIC_IRQ_PROBE |
| 40 | select GENERIC_IRQ_SHOW | 40 | select GENERIC_IRQ_SHOW |
| 41 | select GENERIC_IRQ_PROBE | ||
| 42 | select ARCH_WANT_IPC_PARSE_VERSION | 41 | select ARCH_WANT_IPC_PARSE_VERSION |
| 43 | select HARDIRQS_SW_RESEND | 42 | select HARDIRQS_SW_RESEND |
| 44 | select CPU_PM if (SUSPEND || CPU_IDLE) | 43 | select CPU_PM if (SUSPEND || CPU_IDLE) |