diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-19 20:25:27 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-19 20:25:27 (GMT) |
| commit | 87af0b80c933f05a4c7dd8c5edebe10365e76220 (patch) | |
| tree | 6c33ab1a47b5f1ef196e8847586fb81b17152a0e /arch/s390/Kconfig | |
| parent | 08a978db518dfceb37998bc74a7fed03540cfd08 (diff) | |
| parent | 2ea3c6a2c779e5a6487d2b436770232162dfbbe3 (diff) | |
| download | linux-fsl-qoriq-87af0b80c933f05a4c7dd8c5edebe10365e76220.tar.xz | |
Merge branch 'for-linus' into for-next
Merge the recent HD-audio codec change for fixing recursive suspend
calls.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 3f3d9ca..5dba755 100644 --- a/arch/s390/Kconfig +++ b/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 |