diff --git a/[refs] b/[refs] index 812f23906525..a1204d6755d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080fc66fb5b6feae19fbbe8c6cbd7b11a4dac636 +refs/heads/master: 89868730a756feca7e4b21a97c86487cd565ed22 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index e4191ccbdb7a..6d6e18fee9fe 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/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)