diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-26 09:40:43 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-26 09:40:43 +0400 |
| commit | 9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch) | |
| tree | bca8230897630ca6721bdd7b959142984afa256a /arch/x86/Kconfig | |
| parent | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff) | |
| parent | d7933ab727ed035bdf420d7381b831ba959cecc5 (diff) | |
| download | linux-9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fcefdda5136d..a8f749ef0fdc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1672,7 +1672,6 @@ config RELOCATABLE config RANDOMIZE_BASE bool "Randomize the address of the kernel image" depends on RELOCATABLE - depends on !HIBERNATION default n ---help--- Randomizes the physical and virtual address at which the |