diff --git a/[refs] b/[refs] index 41d1d1b9adfc..bdc1223412a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de33c442ed2a465d2d7804b26dafd2eec067aa34 +refs/heads/master: c9af1e33231912cedae3e49e56621b6c765e57fe diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug index 5b1979a45a1e..770397ec476c 100644 --- a/trunk/arch/x86/Kconfig.debug +++ b/trunk/arch/x86/Kconfig.debug @@ -256,8 +256,6 @@ config CPA_DEBUG help Do change_page_attr() self-tests every 30 seconds. -endmenu - config OPTIMIZE_INLINING bool "Allow gcc to uninline functions marked 'inline'" default y @@ -270,3 +268,6 @@ config OPTIMIZE_INLINING this algorithm is so good that allowing gcc4 to make the decision can become the default in the future, until then this option is there to test gcc for this. + +endmenu +