Merge pull request linux4kix#11 from linux4kix/linux-linaro-lsk-v3.14…

…-mx6 arm: cubox-i and hummingboard defconfig
n-aizu · Sep 28, 2014 · 6fbe2a0 · 6fbe2a0
2 parents 07da1e8 + 4ef6590
commit 6fbe2a0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/arm/configs/imx_v7_cbi_hb_defconfig b/arch/arm/configs/imx_v7_cbi_hb_defconfig
@@ -4699,7 +4699,7 @@ CONFIG_STACK_TRACER=y
 CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENT=y
 # CONFIG_KPROBES_SANITY_TEST is not set
-CONFIG_JUMP_LABEL=y
+# CONFIG_JUMP_LABEL is not set
 CONFIG_OPTPROBES=y
 
 CONFIG_HZ_1000=y