diff --git a/[refs] b/[refs] index 2022ce8bc918..9d322196caa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7 +refs/heads/master: 89e09f5ebba4bcde9852e4be4af536d5b691f20a diff --git a/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig index 15c4a1455cae..ef1f05e437c4 100644 --- a/trunk/arch/ppc64/Kconfig +++ b/trunk/arch/ppc64/Kconfig @@ -40,10 +40,6 @@ config COMPAT bool default y -config FRAME_POINTER - bool - default y - # We optimistically allocate largepages from the VM, so make the limit # large enough (16MB). This badly named config option is actually # max order + 1