diff --git a/[refs] b/[refs] index f325f21de5ac..222c71021363 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9db8c050f6d16d925298f13f2b468342b37d4eee +refs/heads/master: 0f58aac9af2e93a23cd5f33fed0388e350cf58b9 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index 3f3d9ca7a5b6..5dba755a43e6 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -130,6 +130,7 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE select HAVE_UID16 if 32BIT select ARCH_WANT_IPC_PARSE_VERSION + select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL_OLD select GENERIC_CLOCKEVENTS