diff --git a/[refs] b/[refs] index 381fd0419e13..9b05f9abfc0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94fa873ff80cbbfb91f1c1a81cb428f6869a7845 +refs/heads/master: 72cca72a6cefe90810366cd2b244a33069b21f86 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 9722f8bb506c..65f423cc610c 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -156,7 +156,6 @@ config ARCH_MTD_XIP bool config GENERIC_HARDIRQS_NO__DO_IRQ - bool def_bool y if OPROFILE